Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,958 Commits 3 Branches 0 Tags
477fdc1a3ba2a820544bbe61dc638bcd8ebd64ce
Commit Graph

640958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Chang
7ffc0c0efb [automerger skipped] Detects all activities for whether showing work challenge am: 69b3a3cd04 am: d5c18447be -s ours am: 82fa6e3769 -s ours am: bf62b6bfb1 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 27a2a5f986 is already in history

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

Change-Id: I061daa7cd49afa2a504d73fb8114873d5faa8b64
 2021-04-27 23:15:06 +00:00
Beth Thibodeau
c00bb8af95 Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b979843 am: e219886035 am: b0d6e6cd57 am: b32d4d538b am: 8b9f71550c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054747

Change-Id: Ibce6f1a907d0f8105f0499468c266d31f67a21f3
 2021-04-27 23:14:41 +00:00
Chris Tate
e5f2ad1203 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours am: 91fbccc817 am: 18252b299b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450

Change-Id: I496b07ce65577bd215b37e5ecd07663f1ff75e26
 2021-04-27 23:14:21 +00:00
Chris Tate
f5e46bc7ae [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdeea4 -s ours am: 76a15c06f4 -s ours am: e0a844da8b -s ours am: eff05e86d3 -s ours am: 79ba5701cd -s ours 
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 88380a00d5 is already in history

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

Change-Id: Ic69dbc845e53a391ca498dc49924441e8744e533
 2021-04-27 23:13:57 +00:00
Chris Tate
17babeb9f1 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours am: 0dbc306379 -s ours am: 3201b6ee34 -s ours 
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history

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

Change-Id: Idea9fa95098ab38edbe03504464dcbbcb3480d35
 2021-04-27 23:13:24 +00:00
Christopher Tate
f8930138a5 [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours am: 11f4032b5e -s ours am: 45c4c9f1ec -s ours 
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history

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

Change-Id: I8821230fff165e9e45690388fc0626d5e0c6c9ce
 2021-04-27 23:13:19 +00:00
Beth Thibodeau
79b5cd398e Increase maximum allowed size for status bar icons am: 8875da5207 am: cc35c516df am: 39ecfe9aed am: 8d4ac0f225 am: c7930c4045 am: 3fe3d51c13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033398

Change-Id: I4b757761422af0bc4bf5e6c5b591efa90f88b714
 2021-04-27 23:12:25 +00:00
Beth Thibodeau
4b6f8b11b8 Increase maximum allowed size for status bar icons am: 92106a58df am: fcd571f060 am: eded1d8a7c am: c2d3f9f067 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14053514

Change-Id: I3475a7596eb528adf77eaad3e101aad4629e186d
 2021-04-27 23:12:13 +00:00
yawanng
9f4677d532 [automerger skipped] Adds caller check to getAllPackages() am: 264dea63b0 -s ours am: 2f4ff31a2e -s ours am: e57bd828a9 -s ours am: 4c38925244 -s ours am: 0abf7eb3eb -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history

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

Change-Id: I56068d0fa95af3cb8d780a16a14885cda115ab8f
 2021-04-27 23:12:02 +00:00
Patrick Baumann
879252343f [automerger skipped] Revert "Adds caller check to getAllPackages()" am: 8d900812b7 -s ours am: 2db12a46a9 -s ours am: d1c3879708 -s ours am: 3a5b3f8a88 -s ours am: 7733b7b06c -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I9a2f0be60d032060714c84634b4f8410cb06159a
 2021-04-27 23:11:55 +00:00
TreeHugger Robot
1acdd91bb1 [automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into qt-dev am: d035f1b963 am: dcbef79eb9 -s ours am: 130459160f -s ours am: a32c50e74a -s ours 
am skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 b29834bc15 is already in history

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

Change-Id: Ib6e86dd73a61d221d582a47c8c2d513d4e6c731f
 2021-04-27 23:11:17 +00:00
TreeHugger Robot
d9f80447ce Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da1776d am: a9aaed5d47 am: cdbee965a7 am: 71f344b36a am: 45d5be1254 am: c3b709e513 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430253

Change-Id: I8bff3ccc228fb00dcf9fe37777d7f42d79cb6eff
 2021-04-27 23:10:56 +00:00
Beth Thibodeau
aac399076a Merge "Limit maximum allowed size for a status bar icon" into qt-dev am: 81a7a760c8 am: 6540ebaf5c am: 2bb50aba75 am: ca77f64eb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430605

Change-Id: I18f42d46f01599dd17749f5ca0f09c24db694576
 2021-04-27 23:10:34 +00:00
Julia Reynolds
e94e1b92dc [automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38 am: d749dc3510 am: fd89965284 am: 90ef2704fa -s ours am: 2a061f2e25 -s ours am: 3047db2d71 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f1e is already in history

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

Change-Id: I1739a38a46826d1fed84f1c40e0b549f9c4eb213
 2021-04-27 23:10:25 +00:00
Louis Chang
d4a9e3b21b [automerger skipped] Detects all activities for whether showing work challenge am: 6820d70823 -s ours am: 1c750cd367 -s ours am: b64eddc2c9 -s ours am: aecf7c267d -s ours am: 6adacfab63 -s ours am: 86a3587534 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: Ia8d6533751f515eddd0ff7362e1bd4348b62d97d
 2021-04-27 23:09:52 +00:00
Beth Thibodeau
1eb3fe714c [automerger skipped] Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8bf am: 04043de40c am: c7731486df -s ours am: bc6f5f8bf8 am: f0aac434b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430565

Change-Id: I6deb525e128a356249ca2e9fc39857cac0b16c5f
 2021-04-27 23:09:48 +00:00
Louis Chang
30266914fe [automerger skipped] Detects all activities for whether showing work challenge am: fe5e1432cf -s ours am: 850810d0fd -s ours am: 62c71ab0fd -s ours am: dcb100da76 -s ours am: a32b3109ca -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: I72844a8a7302e9c077897b66f5a261dba4cbf353
 2021-04-27 23:09:23 +00:00
Louis Chang
b75ed76ad6 [automerger skipped] Detects all activities for whether showing work challenge am: 69b3a3cd04 am: d5c18447be -s ours am: 82fa6e3769 -s ours am: 77778bca60 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 27a2a5f986 is already in history

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

Change-Id: Ibe5b8e4bcd25c0279ddf1b263ba84ebe0757e725
 2021-04-27 23:08:48 +00:00
Beth Thibodeau
eae0fc9813 Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b979843 am: e219886035 am: b0d6e6cd57 am: b32d4d538b am: 1c8a052b5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054747

Change-Id: Idad086d6d5ca92ae308254dbced55e1869ab8746
 2021-04-27 23:08:22 +00:00
Chris Tate
78bc53b9b4 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours am: 91fbccc817 am: 4246471a5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64b0f627359ab7207f94014583fa2655928872b3
 2021-04-27 23:07:50 +00:00
Chris Tate
5b9815d638 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdeea4 -s ours am: 76a15c06f4 -s ours am: e0a844da8b -s ours am: eff05e86d3 -s ours am: 83afdde7d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a7e3a9031a5fd8ff730192184d89bdc8f74318f
 2021-04-27 23:07:13 +00:00
Chris Tate
d7d19fd262 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours am: 0dbc306379 -s ours am: cb05a19982 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I017d83c3446c9e5d52d5aaa96d69e96a4c913ec4
 2021-04-27 23:06:53 +00:00
Christopher Tate
7db8857dd5 [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours am: 11f4032b5e -s ours am: 80fa91b134 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0177e839e6b6c6e627a9d75d07673c07f84fc1f7
 2021-04-27 23:06:32 +00:00
Beth Thibodeau
00c1da9f7d Increase maximum allowed size for status bar icons am: 8875da5207 am: cc35c516df am: 39ecfe9aed am: 8d4ac0f225 am: c7930c4045 am: bde5259f51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033398

Change-Id: I1158578371365683cf0e41349b9cde8563c4a330
 2021-04-27 23:06:07 +00:00
Beth Thibodeau
0e01abae54 Increase maximum allowed size for status bar icons am: 92106a58df am: fcd571f060 am: eded1d8a7c am: 60a212dca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14053514

Change-Id: I2592039303683f0cae6ce9c05cf4ad1e14508aed
 2021-04-27 23:05:52 +00:00
yawanng
b5375dfa5a [automerger skipped] Adds caller check to getAllPackages() am: 264dea63b0 -s ours am: 2f4ff31a2e -s ours am: e57bd828a9 -s ours am: 4c38925244 -s ours am: 5202c57904 -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history

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

Change-Id: I5a8e3d6a838f543d3398e9d39189ef0ecadd9ac9
 2021-04-27 23:05:39 +00:00
Patrick Baumann
6d9e196b6d [automerger skipped] Revert "Adds caller check to getAllPackages()" am: 8d900812b7 -s ours am: 2db12a46a9 -s ours am: d1c3879708 -s ours am: 3a5b3f8a88 -s ours am: 65f396f465 -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I5201c8d875df98413081794b471532aacc3efa3d
 2021-04-27 23:05:20 +00:00
TreeHugger Robot
04d15d41d4 [automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into qt-dev am: d035f1b963 am: dcbef79eb9 -s ours am: 130459160f -s ours am: 21dad0f35e -s ours 
am skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 b29834bc15 is already in history

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

Change-Id: Iddd433e48378beb7c133a62a957925c519044681
 2021-04-27 23:04:47 +00:00
TreeHugger Robot
659d72ef24 Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da1776d am: a9aaed5d47 am: cdbee965a7 am: 71f344b36a am: 45d5be1254 am: 7163f75477 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430253

Change-Id: I45a8633d0c9eb7041849a46676b5bddf89780ba5
 2021-04-27 23:04:22 +00:00
Beth Thibodeau
48cdf0ed6b Merge "Limit maximum allowed size for a status bar icon" into qt-dev am: 81a7a760c8 am: 6540ebaf5c am: 2bb50aba75 am: fbea633c38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430605

Change-Id: I5147c60bf8776ee607591bad9b9a5d0e26e5f4ea
 2021-04-27 23:04:01 +00:00
Beth Thibodeau
a1adc7c07c [automerger skipped] Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8bf am: 04043de40c am: c7731486df -s ours am: bc6f5f8bf8 am: aedb986770 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430565

Change-Id: I20ae1caf066c96e6682215341efb813e878a240e
 2021-04-27 23:03:31 +00:00
Kevin Han
16ab148b5d Exit hibernation when usage is detected 
Potentially leave hibernation if usage is detected. We already leave
whenever we exit force-stop, but in case the states get out of sync,
this guarantees that apps don't get "stuck" in the hibernated state.

Bug: 185511307
Test: atest AppHibernationServiceTest
Change-Id: Iaff873b203ff18002927bec60c346e3fa7288b4e
 2021-04-27 15:56:01 -07:00
TreeHugger Robot
d1293fc9a7 Merge "Removing non-wakeup alarms on user-removed" into sc-dev 2021-04-27 22:44:28 +00:00
TreeHugger Robot
c03a2d303d [automerger skipped] Merge "Adds caller check to getAllPackages()" into oc-mr1-dev am: 835ab4eb82 -s ours am: 38fb80f008 -s ours am: 263adb234a -s ours am: 463477087d -s ours am: 8e2813e52b -s ours am: c3c87660aa -s ours am: 1781e82338 -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history

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

Change-Id: I76aaee1934fbf4103f7389ca515322bbbab4d38e
 2021-04-27 22:37:48 +00:00
Patrick Baumann
b071db4e3e [automerger skipped] Merge "Adds caller check to getAllPackages()" into qt-dev am: 9ecea7a435 -s ours am: e32deee19a -s ours am: 93b289562b -s ours am: 958e64e376 -s ours am: ebb6d6a140 -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history

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

Change-Id: I81fdb5b7cba8f36bf8cf57ac1d31fc7cf89a1eac
 2021-04-27 22:36:59 +00:00
TreeHugger Robot
02b48c2b77 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e7d am: 67352cf086 -s ours am: 48cb3da792 am: 3276544168 am: 5bc4325c38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f6b96d502f90e09425fbb6710cae3166111af7d
 2021-04-27 22:35:55 +00:00
Jonathan Scott
5bb6fa4590 [automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours am: 05bc9eb65d am: 71348ece4f am: 2ec8cc307d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf8e7cd23c68469b52eac134700d94b2e0ff65a2
 2021-04-27 22:35:47 +00:00
TreeHugger Robot
79677ee469 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours am: 65f650b6ac am: d2b2ae912b -s ours am: ad4df34c13 am: b474d2cb17 am: c9534f61b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44007722d81abe54262dc4ca4ee25110e8418796
 2021-04-27 22:35:32 +00:00
Julia Reynolds
d295decb53 [automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38 am: d749dc3510 am: fd89965284 am: 90ef2704fa -s ours am: 2a061f2e25 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f1e is already in history

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

Change-Id: I486e5614e4d829ec51a8d19719085a7941268c46
 2021-04-27 22:35:23 +00:00
Louis Chang
99f54b9b9e [automerger skipped] Detects all activities for whether showing work challenge am: 6820d70823 -s ours am: 1c750cd367 -s ours am: b64eddc2c9 -s ours am: aecf7c267d -s ours am: 6adacfab63 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: Icdc7ea4bc5bb7466a984a354789bc90a7710fd78
 2021-04-27 22:35:12 +00:00
TreeHugger Robot
5aa65e4e29 [automerger skipped] Merge "Add pkg target to snoozing alarm" into oc-mr1-dev am: 119ebe193f -s ours am: c5cd3bcbc1 -s ours am: 6c6d48d228 -s ours am: 61534f62ce -s ours am: 9d21d885df -s ours am: c7a3cb93cf -s ours am: 8e8e5f79e2 -s ours 
am skip reason: Merged-In I6aaf80a11dcae2eca41d4647411126ed41587027 with SHA-1 c73916229d is already in history

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

Change-Id: I98c13404c6eda837504c059e79084778da52ec70
 2021-04-27 22:35:11 +00:00
Louis Chang
eccd031f5c [automerger skipped] Detects all activities for whether showing work challenge am: fe5e1432cf -s ours am: 850810d0fd -s ours am: 62c71ab0fd -s ours am: dcb100da76 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: Ieddd367772be39265edb6ebc7d78603c9603ae86
 2021-04-27 22:35:04 +00:00
Louis Chang
bf62b6bfb1 [automerger skipped] Detects all activities for whether showing work challenge am: 69b3a3cd04 am: d5c18447be -s ours am: 82fa6e3769 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 27a2a5f986 is already in history

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

Change-Id: I91455d649bb90c8f6b3c5e056409481cad16ce00
 2021-04-27 22:34:53 +00:00
TreeHugger Robot
0902df81ee [automerger skipped] Merge "Add pkg target to snoozing alarm" into pi-dev am: 691b6ca55b -s ours am: 6b5ceccc48 -s ours am: 69c672fbc9 -s ours am: 1d5cfe1c28 -s ours am: 420fe3b36a -s ours am: 474977bbe7 -s ours 
am skip reason: Merged-In I6aaf80a11dcae2eca41d4647411126ed41587027 with SHA-1 c73916229d is already in history

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

Change-Id: I055c704e320ae471251947765b807a2691d82c51
 2021-04-27 22:34:47 +00:00
Beth Thibodeau
8b9f71550c Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b979843 am: e219886035 am: b0d6e6cd57 am: b32d4d538b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054747

Change-Id: I8fb27d045a7941f142dbe9b3a2dae9aa992b51a2
 2021-04-27 22:34:43 +00:00
Chris Tate
18252b299b [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours am: 91fbccc817 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450

Change-Id: I235d145a0f586bef8436d492a7e8a7fdddabec43
 2021-04-27 22:34:30 +00:00
Julia Reynolds
3047db2d71 [automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38 am: d749dc3510 am: fd89965284 am: 90ef2704fa -s ours am: 2a061f2e25 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f1e is already in history

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

Change-Id: I613fab60acf69ed0daf08587149db3fcf22e8042
 2021-04-27 22:34:19 +00:00
TreeHugger Robot
b67b812e9d [automerger skipped] Merge "Add pkg target to snoozing alarm" into qt-dev am: 8e75c0526a am: 5079aa86c8 -s ours am: 34e0644a08 -s ours am: a5edb15f7f -s ours am: 5d1dea705b -s ours 
am skip reason: Merged-In I6aaf80a11dcae2eca41d4647411126ed41587027 with SHA-1 c73916229d is already in history

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

Change-Id: Ibf5fa35ea449cf6f6f7efc033068ab7253526059
 2021-04-27 22:34:17 +00:00
Louis Chang
86a3587534 [automerger skipped] Detects all activities for whether showing work challenge am: 6820d70823 -s ours am: 1c750cd367 -s ours am: b64eddc2c9 -s ours am: aecf7c267d -s ours am: 6adacfab63 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: I1b4f8fbf4f1a6b251a70b769814c01f088c24393
 2021-04-27 22:34:08 +00:00
Louis Chang
a32b3109ca [automerger skipped] Detects all activities for whether showing work challenge am: fe5e1432cf -s ours am: 850810d0fd -s ours am: 62c71ab0fd -s ours am: dcb100da76 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: I3909da72b01c14c34242470594affea01cc4cac0
 2021-04-27 22:34:02 +00:00