Commit Graph

499395 Commits

Author SHA1 Message Date
Linus Tufvesson
97341f2b60 Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into rvc-dev am: 69e4884a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537950

Change-Id: Ic2afdf86e6fbd2f4af371226acf073a1da7da7f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 09:12:48 +00:00
Linus Tufvesson
24f4ebf4a1 DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: 778191bdf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537950

Change-Id: I0ac1c7e30fb0851d751d4b1d1afeb72808fdae4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 09:12:30 +00:00
Linus Tufvesson
69e4884a10 Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into rvc-dev 2022-08-10 07:58:52 +00:00
Oli Lan
7cc9540c50 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23d922594540bfb02546392b254680cd0f7d8674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:09:45 +00:00
Oli Lan
f36dd9d93f [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I631c9e39cc6368a67b11dae2e6649ec164ee9a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:09:29 +00:00
Oli Lan
d69df94c24 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b52e16af09235bf13cc1c2b4c12299bc7c2fbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 10:54:17 +00:00
Oli Lan
2f4d46fca2 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34823ac46a356f70554c8c1c9bfe4e8a54fc7cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 10:53:57 +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
fb6f84fe35 Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Ie9e4bde2bc2ad7fb63a770e9f56ea731786a09da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 10:38:31 +00:00
Oli Lan
cf5587d2ca Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: I25f5944fcf0d975ab8f202e5701ea28b681544f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 10:38:18 +00:00
Oli Lan
82a9fa1667 Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev 2022-08-08 10:08:09 +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
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
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
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
Linus Tufvesson
778191bdf2 DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity
These windows can only be placed on private virtual displays, and as
such they should not be considered when deciding if an application has
any visible windows or not.

Bug:205130886
Test:Manually verified that sample from 205130886 no longer allows
background activity launches
Test: atest CtsActivityManagerBackgroundActivityTestCases

Change-Id: I76208722bbb7a407ba1f2dc4305a28226166414d
Merged-In: I76208722bbb7a407ba1f2dc4305a28226166414d
2022-08-05 17:27:52 +02: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
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
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
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
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
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
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
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
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
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
Oli Lan
49d8f9325a Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."
This reverts commit a7621e0ce0.

Reason for revert: Regression, DELETE_SYSTEM_APP flag no longer works

Change-Id: I7386d1ba3d61b95836b85c52214c83b216c478e8
2022-07-19 10:45:22 +00: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
455a525421 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 14:16:28 +00:00