Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
617,299 Commits 3 Branches 0 Tags
57a06fe3ad21945faba166198f606682dbd544ec
Commit Graph

617299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
57a06fe3ad Merge "Reset bouncer hidden amount on keyguard show" 2021-01-06 18:15:50 +00:00
TreeHugger Robot
b326a72a2f Merge "Revert "Add shared transitions for screenshot->markup"" 2021-01-06 17:56:38 +00:00
TreeHugger Robot
88a42cd208 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser" into rvc-qpr-dev am: a428448b1e am: 9858b561b1 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I406f1d32e78806a1320fa8bf9e0e9879562a0486
 2021-01-06 17:51:23 +00:00
arangelov
2da2979a6c [automerger skipped] [RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser am: 10f79644fc am: f5a379201d -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I922dad24e3bcf0fa4e7ef4d70c5012869ff2b9fc
 2021-01-06 17:51:03 +00:00
Beth Thibodeau
09c9e39bc9 Merge "Use default color when artwork is too small" into rvc-qpr-dev am: 6ae71ece49 am: 246bde6bf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13287026

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2bdc942ae4007ffbfa77722445dfb53e7878c78
 2021-01-06 17:50:23 +00:00
TreeHugger Robot
40368e2343 Merge "Remove vibration from framework's emergency action" 2021-01-06 17:50:11 +00:00
Peter Kalauskas
7810e62094 Merge "Update icons and text for guest user" 2021-01-06 17:41:25 +00:00
TreeHugger Robot
9858b561b1 Merge "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser" into rvc-qpr-dev am: a428448b1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12977405

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie31572027b89b567d04bad4bbcc41e28d8c9c901
 2021-01-06 17:31:24 +00:00
arangelov
f5a379201d [RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser am: 10f79644fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12977405

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I162d5c8dd07adab106ba7c4201d984d98854e111
 2021-01-06 17:31:09 +00:00
Beth Thibodeau
246bde6bf3 Merge "Use default color when artwork is too small" into rvc-qpr-dev am: 6ae71ece49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13287026

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d139c24f7383d3cb6751ded3a7a78d91555ff89
 2021-01-06 17:29:59 +00:00
Miranda Kephart
524336dbbd Revert "Add shared transitions for screenshot->markup" 
This reverts commit 6b330ef7ee.

Reason for revert: cause of bug: 176874121

Change-Id: Icc87484f7cbe26bbe479fc47dca0aadae82e377b
 2021-01-06 17:27:55 +00:00
TreeHugger Robot
a428448b1e Merge "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser" into rvc-qpr-dev 2021-01-06 17:21:50 +00:00
Beth Thibodeau
6ae71ece49 Merge "Use default color when artwork is too small" into rvc-qpr-dev 2021-01-06 17:06:44 +00:00
Ashwini Oruganti
7e8ae00d9c Merge "Revert "Enforce that a PendingIntent has an explicit mutability ..."" 2021-01-06 16:58:02 +00:00
Beverly
339174c88d Reset bouncer hidden amount on keyguard show 
in order to set the lock icon color appropriately

Test: manual
Fixes: 176784969
Change-Id: I07ce698d36a745aeb56d273e5e0c0dd2d135793f
 2021-01-06 16:46:27 +00:00
Tiger Huang
dd0180a142 Merge "Preserve the controlling state of appearance and behavior" 2021-01-06 16:44:03 +00:00
James Mattis
873b5f1785 Merge "Update to Diagnostic Callback flows for multilayer" am: 3b75f7a8e9 am: ea848623c9 am: 4a1a9748f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58fea937ee7f785efe3ff36d4bc9cf506c87a3ff
 2021-01-06 16:43:39 +00:00
TreeHugger Robot
6c65dd42d9 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user" into rvc-qpr-dev am: b8e8fe89e7 am: dd68beb94f -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f4f8b07e8ecbf35c9edb438afd5edb119ec3f11
 2021-01-06 16:43:09 +00:00
Alex Kershaw
4b60616e7f [automerger skipped] [RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user am: 72704403aa am: fb688b44d8 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74547f389c1fc1f39c82cd27065692296ee58420
 2021-01-06 16:42:52 +00:00
Ashwini Oruganti
a4a5d729ae Revert "Enforce that a PendingIntent has an explicit mutability ..." 
Revert "PendingIntentTest: Add tests to check enforced mutabilit..."

Revert submission 13048968-pi-enforce-mutability-flag

Reason for revert: Lots of regressions since merging this, reverting to address those.
Reverted Changes:
If49be6141:Enforce that a PendingIntent has an explicit mutab...
I885d1b558:PendingIntentTest: Add tests to check enforced mut...

Change-Id: I371cef3b423c23736b520ca5c29ee4ff9c51bb33
 2021-01-06 16:40:56 +00:00
Edgar Wang
5797051388 Merge "Add Extra gear icon in RadioButtonPreference" 2021-01-06 16:31:02 +00:00
TreeHugger Robot
a4a2982cdf Merge "Fix set-device-owner from shell for AAOS" 2021-01-06 16:27:01 +00:00
James Mattis
4a1a9748f0 Merge "Update to Diagnostic Callback flows for multilayer" am: 3b75f7a8e9 am: ea848623c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e2d2130c14af20fb422f6c7ebcccb36618dfac
 2021-01-06 16:08:25 +00:00
TreeHugger Robot
dd68beb94f Merge "[RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user" into rvc-qpr-dev am: b8e8fe89e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I478609b9b9b97c26eafe9676335cbcb42a0e9683
 2021-01-06 16:00:56 +00:00
Alex Kershaw
fb688b44d8 [RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user am: 72704403aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9fa890f6b0582997173c9cef54c397c679db23e
 2021-01-06 16:00:40 +00:00
James Mattis
ea848623c9 Merge "Update to Diagnostic Callback flows for multilayer" am: 3b75f7a8e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eb635ce32e4df1d0d0e78ff7398790d2f3fdc7e
 2021-01-06 15:45:01 +00:00
TreeHugger Robot
b8e8fe89e7 Merge "[RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user" into rvc-qpr-dev 2021-01-06 15:36:36 +00:00
James Mattis
3b75f7a8e9 Merge "Update to Diagnostic Callback flows for multilayer" 2021-01-06 15:25:56 +00:00
Lorenzo Colitti
8c82856523 [automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: 91348d9f22 am: 2652fbdaf1 am: 4d4aa881b0 -s ours 
am skip reason: Change-Id Ie364ab50f416e7821e70f4539a881eea828e1256 with SHA-1 fb9c6e8d3c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie47420e86dfe4aec19162545116023c9da75aa14
 2021-01-06 15:22:38 +00:00
Bill Yi
dafd1053cf [automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: e4b09fd3dd am: 511b12a0c4 -s ours am: acb77301d3 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f8224c4b836362a39caa01b671582f5e656d6ef
 2021-01-06 15:21:31 +00:00
Bill Yi
63e175a155 [automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 2dcac1e2a1 am: c10c4e8f3e -s ours am: e0fc7fdc88 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2530058337fb3d62890ee3c671dc8f123d7ea8f
 2021-01-06 15:21:12 +00:00
Lorenzo Colitti
4d4aa881b0 Merge "Migrate away from AsyncChannel in NetworkAgent" am: 91348d9f22 am: 2652fbdaf1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7aa23752ed86096651e122b8497180052fa16337
 2021-01-06 14:44:24 +00:00
Bill Yi
acb77301d3 [automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: e4b09fd3dd am: 511b12a0c4 -s ours 
am skip reason: Change-Id I034d45f1afcdd07c0b12e2db7e4134b695ec5c70 with SHA-1 ca6272cf1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34bd275db0a8ba59f9443d29e600f0e09384965c
 2021-01-06 14:43:27 +00:00
Bill Yi
e0fc7fdc88 [automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 2dcac1e2a1 am: c10c4e8f3e -s ours 
am skip reason: Change-Id I034d45f1afcdd07c0b12e2db7e4134b695ec5c70 with SHA-1 ca6272cf1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a1b6a0ce2d52dfd82d11521a8465c0465dd0591
 2021-01-06 14:43:19 +00:00
Dave Mankoff
5736696b68 Merge changes from topic "b172655679-tap-falsing" 
* changes:
  Connect FalsingManager to HistoryTracker.
  Add ability to ignore gestures in FalsingManager
 2021-01-06 14:42:05 +00:00
Dave Mankoff
cbe7ed65bd Merge "Remove BatteryController reference from ReverseChargingController" 2021-01-06 14:41:11 +00:00
Lorenzo Colitti
2652fbdaf1 Merge "Migrate away from AsyncChannel in NetworkAgent" am: 91348d9f22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29a9073fcd69953811d899d3b421624d21a81edb
 2021-01-06 14:26:23 +00:00
Bill Yi
511b12a0c4 Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: e4b09fd3dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3c3112de6c6b91e7f5abb80c948dbe8db8c9195
 2021-01-06 14:22:37 +00:00
Bill Yi
c10c4e8f3e Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 2dcac1e2a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c3638aad7320dfc31798963ca7101c675212c3a
 2021-01-06 14:19:18 +00:00
Beverly Tai
99e9f0dc5c Merge "Use app uids in DndRule proto pulled atom" 2021-01-06 14:11:35 +00:00
Lorenzo Colitti
91348d9f22 Merge "Migrate away from AsyncChannel in NetworkAgent" 2021-01-06 14:10:21 +00:00
Bill Yi
e4b09fd3dd Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" 2021-01-06 13:58:58 +00:00
TreeHugger Robot
d880d06006 Merge "Add tappable elements insets types to WM Wrapper" 2021-01-06 13:55:54 +00:00
Treehugger Robot
9f09740627 Merge "Add WM owners to the OWNERS of the related core tests" am: b59598f790 am: 56dde88a69 am: 71b7dc627a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia75cd8d2866bc2107884c0789e82d12a1b2ad6dc
 2021-01-06 13:29:51 +00:00
Alex Kershaw
72704403aa [RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user 
Currently, it will always look in user 0 since it uses the DPM from
mContext, which will always be from user 0 as WPMS is in the system
server process.

Extend DPMI to provide the necessary external helper API. This is
preferable to just using createContextAsUser before getting the DPM
instance since it avoids a second binding.

Fixes: 144048540
Fixes: 172682826
Bug: 153995973
Bug: 174642338
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetWallpaper_disallowed
Change-Id: I52b71000fac31ff6725ddded58206f69b263ae33
(cherry picked from commit 5b36ee3f1d)
 2021-01-06 13:08:42 +00:00
Treehugger Robot
71b7dc627a Merge "Add WM owners to the OWNERS of the related core tests" am: b59598f790 am: 56dde88a69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b5ea5e38660cabfbb853fee49ca07a0d672a2ee
 2021-01-06 13:05:20 +00:00
Treehugger Robot
56dde88a69 Merge "Add WM owners to the OWNERS of the related core tests" am: b59598f790 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2dc466fb1e8eb6c8f43283980bcdc5b22a1af35
 2021-01-06 12:50:15 +00:00
Riddle Hsu
47fcbd746c Merge "Remove IActivityTaskManager#setTaskWindowingModeSplitScreenPrimary" 2021-01-06 12:46:08 +00:00
TreeHugger Robot
974f4c3149 Merge "Handle provider initialization failure" 2021-01-06 12:28:28 +00:00
Treehugger Robot
b59598f790 Merge "Add WM owners to the OWNERS of the related core tests" 2021-01-06 12:27:13 +00:00