Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
649,507 Commits 3 Branches 0 Tags
487c65ea5ddedf442f7ec0039696497de258b2f5
Commit Graph

649507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oli Lan
487c65ea5d Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830

Change-Id: Id3e8ee4b08c109213ea3473a38b562dfb3eaf110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 10:54:38 +00:00
Oli Lan
bc227f010a Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830

Change-Id: I38ba3d758ec70e7015656d67558aa845292fe085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 10:38:42 +00:00
Oli Lan
fefefdc7ff Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev 2022-08-08 10:07:34 +00:00
TreeHugger Robot
62c968ffe2 Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into sc-dev 2022-08-06 04:19:03 +00:00
Aseem Kumar
a5201399db [automerger skipped] Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into rvc-qpr-dev am: fb5f9cb95c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8c34713336d0243bf1b9c0ae920510bb6edb065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-06 02:15:36 +00:00
Aseem Kumar
8499a1e3ce [automerger skipped] DO NOT MERGE am: 5c3d1dceb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e4bce023e4f67e6cad58677469c846d6bdab4fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-06 02:15:22 +00:00
Aseem Kumar
fb5f9cb95c Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into rvc-qpr-dev 2022-08-05 23:56:42 +00:00
Aseem Kumar
581958c324 [automerger skipped] Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into rvc-dev am: ea3ccf17fe -s ours am: 83ef3b9773 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7d97d5518747330488a268d1c76fe72d46c14de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-05 22:30:39 +00:00
Aseem Kumar
1db76abd40 [automerger skipped] DO NOT MERGE am: aa58f99079 -s ours am: 17acc1cf68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13309e28dc5038bc593b11b96068361ccd4733e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-05 22:30:29 +00:00
Aseem Kumar
83ef3b9773 [automerger skipped] Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into rvc-dev am: ea3ccf17fe -s ours 
am skip reason: Merged-In I80fabf3a64c55837db98ff316e7e5420129c001b with SHA-1 3f218c9a5e is already in history

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

Change-Id: Id516bb79eddf22b24b940377d497071ff842aec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-05 22:05:26 +00:00
Aseem Kumar
17acc1cf68 [automerger skipped] DO NOT MERGE am: aa58f99079 -s ours 
am skip reason: Merged-In I80fabf3a64c55837db98ff316e7e5420129c001b with SHA-1 3f218c9a5e is already in history

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

Change-Id: I77fc3450a61671703ca10b293d747aaaa3f103c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-05 22:05:19 +00:00
Aseem Kumar
ea3ccf17fe Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into rvc-dev 2022-08-05 21:38:57 +00:00
Aseem Kumar
ee69188241 [automerger skipped] DO NOT MERGE am: 3f218c9a5e am: e0243c7661 -s ours am: a7fd96bf38 -s ours am: 6059e668f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id46609b73c4271da34313eb8b55578f6cc5dcfb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-05 20:31:16 +00:00
Aseem Kumar
6059e668f9 [automerger skipped] DO NOT MERGE am: 3f218c9a5e am: e0243c7661 -s ours am: a7fd96bf38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3df5d13e6bc4671657b33e2d97b9b35d0b0ff0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-05 19:57:54 +00:00
Aseem Kumar
a7fd96bf38 [automerger skipped] DO NOT MERGE am: 3f218c9a5e am: e0243c7661 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I662d6e6e5476b298d24de3903bc7cfa2f339afb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-05 19:15:08 +00:00
Aseem Kumar
e0243c7661 DO NOT MERGE am: 3f218c9a5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17595878

Change-Id: Ide4ce7536d9637969b483d05f729e6d8c800b49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-05 18:33:55 +00:00
Aseem Kumar
c48f5407d5 DO NOT MERGE 
Move accountname and typeName length check from Account.java to AccountManagerService.

Bug: 169762606
Test: atest AccountManagerServiceTest
Change-Id: I80fabf3a64c55837db98ff316e7e5420129c001b
(cherry picked from commit 0adcadb0b2)
 2022-08-04 23:01:02 +00:00
Aseem Kumar
5c3d1dceb0 DO NOT MERGE 
Move accountname and typeName length check from Account.java to AccountManagerService.

Bug: 169762606
Test: atest AccountManagerServiceTest
Change-Id: I80fabf3a64c55837db98ff316e7e5420129c001b
(cherry picked from commit 0adcadb0b2)
Merged-In: I80fabf3a64c55837db98ff316e7e5420129c001b
 2022-08-04 22:32:07 +00:00
Aseem Kumar
3f218c9a5e DO NOT MERGE 
Move accountname and typeName length check from Account.java to AccountManagerService.

Bug: 169762606
Test: atest AccountManagerServiceTest
Change-Id: I80fabf3a64c55837db98ff316e7e5420129c001b
 2022-08-04 22:21:52 +00:00
Aseem Kumar
aa58f99079 DO NOT MERGE 
Move accountname and typeName length check from Account.java to AccountManagerService.

Bug: 169762606
Test: atest AccountManagerServiceTest
Change-Id: I80fabf3a64c55837db98ff316e7e5420129c001b
(cherry picked from commit 0adcadb0b2)
Merged-In: I80fabf3a64c55837db98ff316e7e5420129c001b
 2022-08-04 06:54:29 +00:00
Jeff DeCew
7c5b922af8 [automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours am: 2bd5ab6f26 -s ours am: 04928c8771 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1104933e284fd70066ed54ac294a7491323e633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 20:55:08 +00:00
Jeff DeCew
04928c8771 [automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours am: 2bd5ab6f26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2192402fbd836aa9a4777721c8ecc3e5f9eb63da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 20:38:50 +00:00
Jeff DeCew
2bd5ab6f26 [automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf13340b59f5d67c7c4582d339d92f94905fae08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 20:21:28 +00:00
Jeff DeCew
279ecc9dc1 Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev 2022-08-02 18:56:23 +00:00
Jeff DeCew
518980587b RESTRICT AUTOMERGE: Fix build breakage from merge conflict. 
Merging 8ce3c53fcf into qt-qpr1-dev resulted in a merge conflict due to a method being moved between qt-qpr1-dev and rvc-dev, such that the patch backported from rvc-dev didn't match at all.  Removing the old method makes this branch match qt-dev and rvc-dev.

Test: will use abtd to validate the build and the resulting logic.

Original changes: Id82d20c9f1f2001400871b5381f52b40fbdf81c5

Original
Bug: 231322873

Breakage
Bug: 241087006

Change-Id: Ic4f8d701d97aa9b6c72875df8c7eab5fd51934e0
 2022-08-02 14:05:08 +00:00
Jeff DeCew
3bde57adaf [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours 
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

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

Change-Id: I1a3878c2fe39b71b1cf347d0f3b41b0deecf8178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 13:20:07 +00:00
Jeff DeCew
ac47d942ee [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours 
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

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

Change-Id: I14361fb68915b75ed0f231ea59442e22cb65e803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 13:03:05 +00:00
Jeff DeCew
d011967068 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours 
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

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

Change-Id: Id519e6c7a071bc726f645eda89ddb36d547786fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 12:37:53 +00:00
Jeff DeCew
7330570922 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: If6faade37cf6df1dcd7a1574b341b4fc9f3dabbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 12:22:05 +00:00
Jeff DeCew
b38c650ea9 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev 2022-08-02 11:56:41 +00:00
Jeff DeCew
722ca99029 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104

Change-Id: I6ee71f28d447e32c565b5e60c558b558d965dc10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:57:07 +00:00
Jeff DeCew
f7b8f7233a Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104

Change-Id: If2e92feffef02aa3315afd3485394c7042e7af0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:38:51 +00:00
Jeff DeCew
e35bab3aa0 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev 2022-08-01 19:18:45 +00:00
Jeff DeCew
9d20909eae Fix Notification redaction when power cycling a non-dozing device while occluded. 
This issue was originally raised in the S timeline, but had already been fixed by the refactor to use UnlockedScreenOffAnimationController, which called updateIsKeyguard(/*force*/ true) from onFinishedWakingUp().  This solved the problem of re-triggering the redaction, but it also intriduced a new bug where the keyguard could end up briefly showing on top of the occluding activity when AOD was supported but off.  As a result, they limited the call to when the AOD was on (and animations were controlling, etc).  This CL uses the opposite check to make sure we recalcualte redaction (and only redaction, not the whole keyguard) when waking up while occluded.

We also needed to make sure that we rerun the notification pipeline when updating public information so that any necessary public views are sure to inflate.  That rerun has been limited in scope to conditions where the public mode information has detectably changed.

Bug: 189575031
Bug: 239828798
Test: CTS Verifier NotificationPrivacyTest on emulator, AOD off, AOD on
Merged-In: I95443ee6b77377aceb54b983d34131628027da9b
Change-Id: I95443ee6b77377aceb54b983d34131628027da9b
 2022-07-29 17:05:31 +00:00
Suprabh Shukla
0ded155f96 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I24edf0e10aab3bc511a7978cb24258911c71efed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 05:29:06 +00:00
Suprabh Shukla
63e138df10 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Ic6f11c6c8de6312c1b1b8233bbeae50e0d3f7e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 05:28:30 +00:00
Suprabh Shukla
566f694615 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I0e77efe83a23fcecda2639f0284b981a5a7f5db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 05:11:08 +00:00
Suprabh Shukla
60276bee2d [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Ia9194cffec3f973a504dccdfac89b10b0f8f46b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 05:11:00 +00:00
Suprabh Shukla
da44101e4f Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev 2022-07-22 04:35:18 +00:00
Oli Lan
d9089fbe06 Revert "Prevent non-admin users from deleting system apps." 
This reverts commit 6c870e1579.

Reason for revert: Regression, DELETE_SYSTEM_APP flag no longer works

Change-Id: Id3eb9e08a5404e88c39235d0d47337ed41bc6139
Merged-In: I4e959e296cca9bbdfc8fccc5e5e0e654ca524165
 2022-07-20 10:12:40 +00:00
Suprabh Shukla
1479d4c594 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ib5e63c6277a7538ba41c9ff2c3517fe016e43deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:45:27 +00:00
Suprabh Shukla
c2841d8ef1 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ia6b5324d8af914029711c1fb63af6b45d5f2b217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:19:42 +00:00
Suprabh Shukla
909251a2ca Stop crashing the system on hitting the alarm limit 
Exempting the system as a runtime restart is not clearly
better than extreme memory and computation pressure that can result from
the originating spam.
Callers in the system should guard against any spammy requests that lead
them to create a lot of alarms.

Test: Builds, boots and existing tests should pass.

atest CtsAlarmManagerTestCases:UidCapTests
atest FrameworksMockingServicesTests:AlarmManagerServiceTest

Bug: 234441463
Change-Id: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
(cherry picked from commit 3b9f3f4a0f)
Merged-In: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
(cherry picked from commit c010da3a46)
 2022-07-20 07:02:12 +00:00
Suprabh Shukla
ff26f6a3b7 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I06963a3201ef81c1fe537bab7a1d51f1e305a924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:02:11 +00:00
Suprabh Shukla
ee9331c0d3 Stop crashing the system on hitting the alarm limit am: c010da3a46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069

Change-Id: I0fe52c40c5e9d38ea5c4d31dd901c1c03d5f8ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 04:39:11 +00:00
Suprabh Shukla
c010da3a46 Stop crashing the system on hitting the alarm limit 
Exempting the system as a runtime restart is not clearly
better than extreme memory and computation pressure that can result from
the originating spam.
Callers in the system should guard against any spammy requests that lead
them to create a lot of alarms.

Test: Builds, boots and existing tests should pass.

atest CtsAlarmManagerTestCases:UidCapTests
atest FrameworksMockingServicesTests:AlarmManagerServiceTest

Bug: 234441463
Change-Id: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
(cherry picked from commit 3b9f3f4a0f)
Merged-In: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
 2022-07-20 01:48:40 +00:00
TreeHugger Robot
8b2f5cecd1 Merge "Stop crashing the system on hitting the alarm limit" into sc-dev 2022-07-20 01:17:36 +00:00
Jeff DeCew
8ce3c53fcf Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior. 
Bug: 231322873
Test: atest NotificationInterruptStateProviderImplTest
Merged-In: Id82d20c9f1f2001400871b5381f52b40fbdf81c5
Change-Id: Id82d20c9f1f2001400871b5381f52b40fbdf81c5
 2022-07-20 01:13:11 +00:00
Jeff DeCew
09761a98b5 Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior. 
Bug: 231322873
Test: atest NotificationInterruptStateProviderImplTest
Merged-In: Id82d20c9f1f2001400871b5381f52b40fbdf81c5
Change-Id: Id82d20c9f1f2001400871b5381f52b40fbdf81c5
 2022-07-20 00:48:11 +00:00
Julia Reynolds
fd03677090 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70e6f3db876f3db30e9431ff491360636b01c622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:03:40 +00:00