drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
627,502 Commits 1 Branch 0 Tags
Commit Graph

627502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2aebc3e739 Merge "Add vibrator capabilities to service dumpsys" into sc-dev 2021-03-04 20:09:57 +00:00
Eugene Susla
9076840750 Merge "Address API council feedback" into sc-dev 2021-03-04 19:09:23 +00:00
TreeHugger Robot
4e92407479 Merge "Use InputEventAssigner to assign input to frame" into sc-dev 2021-03-04 18:03:33 +00:00
Julien Desprez
69f871e021 [automerger skipped] Merge "DO NOT MERGE: Move AlarmManager to apex" into mainline-prod am: 683f573462 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13756708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6e758f308f108f9dfe383ca0320467e7b1ebba1
 2021-03-04 17:51:22 +00:00
Miranda Kephart
d93c628dd5 [automerger skipped] Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev am: 9c62f07486 am: da87107602 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7ff1c5ff57bacfa2fd9575b4cf68fd84a48512e
 2021-03-04 17:50:21 +00:00
Miranda Kephart
d5740f827a [automerger skipped] [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 1eecc874b6 am: cc526dd833 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46b1a2f5712e55dff7d27301167026ec784ad7f1
 2021-03-04 17:50:05 +00:00
Winson Chung
adb49c9c6d Merge "Use the right executor for callbacks in Shell code" into sc-dev 2021-03-04 17:37:40 +00:00
Felipe Leme
d42e4a6771 Merge "Add parent check on DevicePolicyManager.isSafeOperation()" into sc-dev 2021-03-04 17:20:20 +00:00
Felipe Leme
1b8c938a89 Merge "Dump PersonalAppsSuspensionHelper state." into sc-dev 2021-03-04 17:16:21 +00:00
Julien Desprez
683f573462 Merge "DO NOT MERGE: Move AlarmManager to apex" into mainline-prod 2021-03-04 17:14:33 +00:00
Julien Desprez
e9989001f3 Merge changes from topic "move-alarmmanager-mainline-prod" into sc-dev 
* changes:
  [automerged blank] DO NOT MERGE: Move AlarmManager to apex 2p: 7c0ee35b1e
  DO NOT MERGE: Move AlarmManager to apex
 2021-03-04 17:14:33 +00:00
Miranda Kephart
072a1bc836 [automerger skipped] Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev am: 9c62f07486 am: db318cc890 am: b4f58639b0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I735706aef8846900cc9b2c4e22e8b23662ccb246
 2021-03-04 16:58:04 +00:00
Miranda Kephart
7c265ed8c8 [automerger skipped] [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 1eecc874b6 am: de813c45dd am: 09d2e03de5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99457f65f21a0509f9ec23a492c9cebe16a963e7
 2021-03-04 16:57:53 +00:00
Miranda Kephart
f5e2a6dffb [automerger skipped] Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-qpr-dev am: 42dc4d3f45 am: 450649c1ab -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519314

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f65ac6834d81e0a4e4490a1b4bd2a6bc870b7d4
 2021-03-04 16:57:37 +00:00
Miranda Kephart
eef22505e2 [automerger skipped] [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 87adff6976 am: 51edde2c17 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519314

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iead07add57d52c66134faf2d24eefbf1a4244ed7
 2021-03-04 16:57:27 +00:00
Winson Chiu
933bea0ee8 Merge changes I28bc7390,I2b248726,Ia7b7acff,Ia81866d2,I5b0deac6, ... into sc-dev 
* changes:
  Rename to DomainVerificationUserState
  Rename to DomainVerificationInternalUserState
  Expose getDomainVerificationUserSelection as public API
  Fix setDomainVerificationLinkHandlingAllowed docs
  Rename get -> queryValidVerificationPackageNames
  Make DomainVerificationManager a final class
 2021-03-04 16:57:00 +00:00
Peter Kalauskas
e7283b94bc Merge "Fix doze bug in keyguard user switcher" into sc-dev 2021-03-04 16:14:45 +00:00
Miranda Kephart
da87107602 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev am: 9c62f07486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33c800e9deb541cef26cb5f668b337b6b8a63e28
 2021-03-04 16:13:14 +00:00
Miranda Kephart
cc526dd833 [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 1eecc874b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a4ced63c067522eed4015eaef82e155ca2e119
 2021-03-04 16:13:10 +00:00
Miranda Kephart
b4f58639b0 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev am: 9c62f07486 am: db318cc890 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe5b5c194df5dfe3615335cb83b9272272848af3
 2021-03-04 16:10:00 +00:00
Miranda Kephart
09d2e03de5 [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 1eecc874b6 am: de813c45dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5309cb22406cb5774052fb0e1ceac7979faa6172
 2021-03-04 16:09:50 +00:00
Miranda Kephart
450649c1ab Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-qpr-dev am: 42dc4d3f45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519314

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea22115bb397fe058ad0ace7cd2889236fb26b53
 2021-03-04 16:09:30 +00:00
Miranda Kephart
51edde2c17 [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 87adff6976 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519314

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I099125bcee80fb668c0f4a222247b318c699cb38
 2021-03-04 16:09:17 +00:00
Miranda Kephart
db318cc890 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev am: 9c62f07486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I906326adab8ee3de29aec6c04e872c88862d61dc
 2021-03-04 16:08:49 +00:00
Miranda Kephart
de813c45dd [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 1eecc874b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c815ff5109965f0015759c7e9bd816406d7ffa4
 2021-03-04 16:08:45 +00:00
TreeHugger Robot
c4684fc7bc Merge "Request focus on recents animation input consumers" into sc-dev 2021-03-04 16:00:48 +00:00
Miranda Kephart
9c62f07486 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev 2021-03-04 15:27:25 +00:00
Miranda Kephart
42dc4d3f45 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-qpr-dev 2021-03-04 15:27:13 +00:00
Miranda Kephart
d9ed1aa920 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into sc-dev 2021-03-04 15:27:03 +00:00
Chalard Jean
74aa1e54e1 Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: 45d586c66c am: 6d2b11cf24 am: 4bd0ba09d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffc8bf72312391e1d54c302d31b5b3cb25d1875e
 2021-03-04 14:51:29 +00:00
Treehugger Robot
5d51200334 Merge changes Ie8d98359,I4d5cadfd am: 69508ee6db am: a2ca3e18cc am: 639ccdbd96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7700b4ed9dd9105beb947944d63138330d8c565e
 2021-03-04 14:51:09 +00:00
Lucas Lin
1cc6c9d26b Merge "Use public API Network#getNetId() to get netid" am: 0292235a96 am: 9943270a61 am: ec4788f8e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9a1e4f225064585448ee66c58a7afb9095ee7e4
 2021-03-04 14:50:43 +00:00
Nathalie Le Clair
622d24f067 Merge changes Ie0a7ec38,I5199dc85 am: da70abc9e1 am: 4d657988ef am: 4b6ffaba2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614041

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ff38391a59578d369512773aaf0a94f66d9fb8d
 2021-03-04 14:49:39 +00:00
Zimuzo Ezeozue
ca94adde13 Merge "Retrieve max ANR dialog before dumping thread stacks" into sc-dev 2021-03-04 14:24:00 +00:00
Ruslan Tkhakokhov
2fd65e2d0e Merge "Support disableIfNoEncryptionCapabilities attribute" into sc-dev 2021-03-04 13:48:18 +00:00
Chalard Jean
4bd0ba09d3 Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: 45d586c66c am: 6d2b11cf24 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28ac065b0574c94c8d8b0dfabaf15db0694b4f90
 2021-03-04 13:46:18 +00:00
Treehugger Robot
639ccdbd96 Merge changes Ie8d98359,I4d5cadfd am: 69508ee6db am: a2ca3e18cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc9b89121bcb09fde41deb3f71322005b1ea2ed
 2021-03-04 13:46:09 +00:00
Lucas Lin
ec4788f8e9 Merge "Use public API Network#getNetId() to get netid" am: 0292235a96 am: 9943270a61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0c5f289b4544ef7d51c28beab196536f0f812e9
 2021-03-04 13:45:52 +00:00
Nathalie Le Clair
4b6ffaba2d Merge changes Ie0a7ec38,I5199dc85 am: da70abc9e1 am: 4d657988ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614041

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14e901f0656ba0981c4a3b57f801ad59d3420dd0
 2021-03-04 13:45:33 +00:00
Chalard Jean
6d2b11cf24 Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: 45d586c66c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic64d571ff8a1f2fdf6b15cde12c6b0a38b4a74b4
 2021-03-04 13:18:57 +00:00
Treehugger Robot
a2ca3e18cc Merge changes Ie8d98359,I4d5cadfd am: 69508ee6db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ec456b2f2fd88648461794dc2301a3825c3c155
 2021-03-04 13:16:29 +00:00
tim peng
edd591aab1 Merge "Add "This phone" string" into sc-dev 2021-03-04 13:14:33 +00:00
Lucas Lin
9943270a61 Merge "Use public API Network#getNetId() to get netid" am: 0292235a96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b68c194109a5839dfb11ed3fe9c3aa4a25a85bb
 2021-03-04 13:14:01 +00:00
Chalard Jean
45d586c66c Merge changes Ide2567b2,I0ee0ce92,Iac3f55af 
* changes:
  Fix a bug where callbacks would see blips
  Fix a bug where a request would not be refcounted
  Fix a bug where UID ranges would not be removed
 2021-03-04 13:12:20 +00:00
Chalard Jean
775feeb477 Fix a bug where callbacks would see blips 
When a new OemPreference object is set, the requests
tracking that default will be re-created to track the
new default. This is true regardless of whether that
particular default has changed.

Because the new copied request doesn't know about the
old satisfier, the rematch code will mistakenly think
this callback didn't have a network and will send a
spurious onAvailable to it.

This patch fixes this by simply copying the satisfier
together with the rest of the NRI. The matching code
will then understand the correct previous status.

As a drive-by fix, this also fixes the annotations on
the reassignment contents that can be null. They have
more complex interactions (not everything can be null
at the same time), but the old annotations were just
putting @NonNull on nullable stuff.
In the same line, while there used to be a case with
a satisfier but no request when the satisfier is the
no-service network, there may now be a case where the
old satisfier is known but the old request isn't.

Test: FrameworksNetTests
Test: TODO : need a unit test for this
Change-Id: Ide2567b226722ea9d35ebd8205943363e27647a2
 2021-03-04 13:11:59 +00:00
Nathalie Le Clair
4d657988ef Merge changes Ie0a7ec38,I5199dc85 am: da70abc9e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614041

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23ed35b13a8499a2dffb3727d8b6be15d41473bd
 2021-03-04 13:11:28 +00:00
Chalard Jean
b80f9b0097 Fix a bug where a request would not be refcounted 
This ends up crashing the system when the request
is unregistered, because the ref counter finds the
count associated with the relevant UID is zero.

Test: FrameworksNetTests
Test: TODO : this needs a new unit test
Change-Id: I0ee0ce925a826d35d8fd58cefb8a870e98ce9add
 2021-03-04 22:08:09 +09:00
Chalard Jean
06985411b7 Fix a bug where UID ranges would not be removed 
When a new preferences object is sent that no longer contains
a particular app, a new set of requests will be generated. All
requests corresponding to that app will be unregistered, and
no new ones will be filed since the preferences no longer
contain that app.

The place where the UID ranges are removed however is in
makeDefaultForApps(), which takes a request. As there no
longer is a default request for this app, makeDefaultForApps()
will never be called with a request for it, and the UID ranges
will never be removed.

This change applies an emergency fix with some side effects
when setting a new preference. This is acceptable, but should
ideally be fixed ; see TODO in the code for details.

Test: FrameworksNetTests
Test: TODO : Need a unit test for this
Change-Id: Iac3f55af5d00d174460e1d4cdd31f581835dbaa6
 2021-03-04 22:08:09 +09:00
Jordan Demeulenaere
824fa2d2f1 Merge "Fix notifications z-height when they don't have shadows." into sc-dev 2021-03-04 12:44:29 +00:00
Treehugger Robot
69508ee6db Merge changes Ie8d98359,I4d5cadfd 
* changes:
  Fix a bug in RequestReassignment#toString
  Cleanup some of the PANS code
 2021-03-04 12:39:04 +00:00