Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,448 Commits 3 Branches 0 Tags
8bb45f2393abbf050e5d1b609530128fcd7e95a1
Commit Graph

660448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff DeCew
8bb45f2393 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 am: f4b38cbaba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104

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

Change-Id: Ib5ca2799d3601b709ddfc4e30ab903ca5e5f4074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 20:15:18 +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
Suprabh Shukla
d4387bc62a [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: ef65df9223 -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: I2b9c7966fa0917b25ae8aee105ef435fd0950723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 06:36:45 +00:00
Suprabh Shukla
48ff28ba37 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: d2b8102403 -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: I5af3771bd42f3a128ee7524ad188a455c3bb4db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 06:36:30 +00:00
Suprabh Shukla
ef65df9223 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -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: Ie92a647cc50646fdbf2f7eccae097c145ad763f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 05:54:48 +00:00
Suprabh Shukla
d2b8102403 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -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: I581c585ea81bbc7e88a09a50af0c1d5d795fcaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 05:54:45 +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
Suprabh Shukla
6a3dcb1f87 [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: 1479d4c594 -s ours am: b3f3961df2 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Iba2292a2af14bc8b9588462d91e35571b971fd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:18:47 +00:00
Suprabh Shukla
b3f3961df2 [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: 1479d4c594 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I69154f34c47b8454f474a8fbbd2764e3db135d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:02:09 +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
98f625151c [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: I7db1b53b317189cb337f978b6b5ad7b536dec456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:39:45 +00:00
TreeHugger Robot
e41a97f229 Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: Ib3093d84642819dbbdad51427ca5588bed584707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:39:37 +00:00
TreeHugger Robot
88e1f760bf [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: Id0099210f887930c7365b7d9c005bce834c63dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:39:17 +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
TreeHugger Robot
950fb419e7 Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev 
* changes:
  [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129
  Stop crashing the system on hitting the alarm limit
 2022-07-20 01:17:36 +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
3f0d1a7985 [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: fd03677090 -s ours am: ccdd838e56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide91e3717d511305836a4499a8f5505f1a88add2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:38:32 +00:00
Julia Reynolds
ccdd838e56 [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: fd03677090 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1372460abd6e6c5221b363cd8ac78564ef2726b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:21:47 +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
Julia Reynolds
9b119e761f [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ad62b910b3ab3344c423c6b9f7e4a1c21c0c744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:45:18 +00:00
Julia Reynolds
a6d920e3d6 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0cba09ba7d819239928de3a1ff04d14f2a01b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:19:17 +00:00
Julia Reynolds
c1d1396751 DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944

Change-Id: I7170c031c2aa4ca409eb1965c6ed20085fac7801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:02:16 +00:00
Julia Reynolds
0d51dea4a3 [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

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

Change-Id: I0da41c7db6ec07ffcd8b07b031237985a59efb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:58:03 +00:00
Julia Reynolds
94d408e520 [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7d2960633d is already in history

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

Change-Id: I8b3bb2dab9bd63afec4932949c31bddd012c3875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:57:49 +00:00
Julia Reynolds
1da6986a74 [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

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

Change-Id: If6036a42358bb91cbe2580d1cc2eb19422b0b618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:38:57 +00:00
Julia Reynolds
be54af47eb [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7d2960633d is already in history

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

Change-Id: Ic9b5ba3fc057b3b1f7131e1a5eb349071c1b9d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:38:52 +00:00
Julia Reynolds
40ffa103b9 [automerger skipped] Merge "Limit the number of concurrently snoozed notifications" into sc-qpr1-dev am: 06de215791 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 e61de0648a is already in history

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

Change-Id: I9f296850fb30ce3c4998103c939adaed45b08519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:23:11 +00:00
Julia Reynolds
2742f53b7d [automerger skipped] Limit the number of concurrently snoozed notifications am: 7d2960633d -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 e61de0648a is already in history

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

Change-Id: I63d2264332c989aabbe6993c8db7e1e8e01ed898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:23:03 +00:00
Julia Reynolds
69f6c9df8d [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

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

Change-Id: Ie37443101f27f06ea2ae5aa5f8bb567de617ec0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:21:50 +00:00
Julia Reynolds
0753020228 Limit the number of concurrently snoozed notifications am: bc808de2f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: I3e18ebaacd69e02859eef7812a4b845fa24b93ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:21:18 +00:00
Julia Reynolds
24b6a449df [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

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

Change-Id: I1ffe9e0dd85420199fddaec5672e8b04431e2060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:20:58 +00:00
Julia Reynolds
06de215791 Merge "Limit the number of concurrently snoozed notifications" into sc-qpr1-dev 2022-07-19 17:00:42 +00:00
Julia Reynolds
60bd9a5e11 Merge "Limit the number of concurrently snoozed notifications" into sc-v2-dev 2022-07-19 17:00:34 +00:00
Presubmit Automerger Backend
030bbaddb4 [automerger skipped] [automerge] DO NOT MERGE: Revert "Make CheckOp return allowed if any attr tag for a package is excluded" 2p: de7b0f6dd0 am: b919b8077f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadc5146ec24c38e9d8e352700553d7eaa5a39cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 19:29:44 +00:00
Presubmit Automerger Backend
b919b8077f [automerge] DO NOT MERGE: Revert "Make CheckOp return allowed if any attr tag for a package is excluded" 2p: de7b0f6dd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19245451

Bug: 231496105
Change-Id: I02054942e9b0b3df13dc322c6ef368d024645b98
 2022-07-11 21:20:52 +00:00
Evan Severson
de7b0f6dd0 DO NOT MERGE: Revert "Make CheckOp return allowed if any attr tag for a package is excluded" 
This reverts commit 25f1b6a1ac.

Revert "Allow system server uid to bypass location restriction"

This reverts commit 1dddfe1f70.

Revert "Disallow privileged apps to bypass location restriction"

This reverts commit 807f4cfc80.

Ice55cbe9524e6d3526210861ad9c431df7255d99 isn't ready in sc

Bug: 231496105
Change-Id: I2a0bd4f2ae75ef300eaf77953baad4ebdae6e189
 2022-07-11 14:20:19 -07:00
Julia Reynolds
c38cc3e355 DO NOT MERGE Limit the number of concurrently snoozed notifications 
Test: atest FrameworksUiServicesTests
Bug: 234441463
Change-Id: I005b43979d1c708fd505c8b33ae0c8cb03ddbb35
Merged-In: I005b43979d1c708fd505c8b33ae0c8cb03ddbb35
(cherry picked from commit 7c38394ae9)
 2022-07-08 15:39:10 +00:00
Julia Reynolds
7d2960633d Limit the number of concurrently snoozed notifications 
Test: atest FrameworksUiServicesTests
Bug: 234441463
Change-Id: I005b43979d1c708fd505c8b33ae0c8cb03ddbb35
Merged-In: I005b43979d1c708fd505c8b33ae0c8cb03ddbb35
(cherry picked from commit 7c38394ae9)
 2022-07-07 15:19:45 +00:00