Commit Graph

499434 Commits

Author SHA1 Message Date
Yuri Lin
b93dab4bb9 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c710d -s ours
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: I754fc047ab9b5834f905d538be92919042b12c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 02:26:26 +00:00
Yuri Lin
1efafda612 [automerger skipped] Enforce zen rule limit on a package level. am: 468dd54e8b -s ours
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Iec40cec2312835a929ca162defc470f58bef44cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 02:26:05 +00:00
Yuri Lin
4d015c710d Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
2022-08-11 01:32:32 +00:00
Yuri Lin
a10aa3cc26 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours am: fa7e3ae758 -s ours
am skip reason: skipped by user yurilin

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

Change-Id: I7ed464a5f7505f158170c100b9a078e9f426d488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 23:01:29 +00:00
Julia Reynolds
1cb919e374 [automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff am: b953b5eff6 -s ours
am skip reason: Merged-In I069fcc124af24227fa50b61d4fc55d6dadc7a20b with SHA-1 93aa03a0db is already in history

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

Change-Id: Iac92362c4a30230920b9803085d67aa9b39a300b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 23:01:17 +00:00
Julia Reynolds
d75bba0cec [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours am: 8e552b10c7 -s ours
am skip reason: skipped by user yurilin

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

Change-Id: Ib5c9cd9eaeb1cb2aa350dff5403a41b88cdf9ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 23:01:01 +00:00
Yuri Lin
fa7e3ae758 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours
am skip reason: skipped by user yurilin

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

Change-Id: Idd8503674a3bae4d09df32d8668866e3e317af62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 22:21:20 +00:00
Julia Reynolds
b953b5eff6 Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448

Change-Id: I30d2f72da503892d245bbedf27f2395f8640923d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 22:21:02 +00:00
Julia Reynolds
8e552b10c7 [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours
am skip reason: skipped by user yurilin

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

Change-Id: Ic9774cd49158e32f7b4e42b1ee410580e8d8ce86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 22:20:44 +00:00
Yuri Lin
b618fee451 Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19117579

Change-Id: I031700a1b2592e1f647f2e727b26610a1e48268f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 21:27:02 +00:00
Julia Reynolds
8a021141ff Fix NPE when deleting old zen rules am: 7bb9cd92bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448

Change-Id: I5849b48a9a54f52c1bb7a8eafa9595c160577547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 21:26:51 +00:00
Julia Reynolds
1eaa443544 Store DND rule owners am: eda171cffa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19197499

Change-Id: I9014b79735494dd9ea763ec18490bb2b12b6ecf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 21:26:47 +00:00
Yuri Lin
718c21f25e Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
2022-08-10 20:51:29 +00:00
Yuri Lin
935664ad48 Merge changes from topic "cherrypick-jr-owner-azffbn1bzv" into rvc-qpr-dev
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
2022-08-10 20:50:40 +00:00
TreeHugger Robot
d082469151 [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 am: 3ff00b522f -s ours am: 276cf3586d -s ours
am skip reason: skipped by user tjstuart

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

Change-Id: Id8aa0e70d712ad381347879968ef590527d6e9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 20:10:44 +00:00
Thomas Stuart
b680cef434 Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19322229

Change-Id: I3751af9dda8a9b79d433bf23dc6bf6997aa5a5fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 20:10:22 +00:00
TreeHugger Robot
276cf3586d [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 am: 3ff00b522f -s ours
am skip reason: skipped by user tjstuart

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

Change-Id: Ie8f4ed29b1dae5a031e971a27009cf052e067d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 19:53:28 +00:00
Thomas Stuart
2f287743a4 Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev 2022-08-10 19:47:08 +00:00
TreeHugger Robot
3ff00b522f Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19300734

Change-Id: Ibc4990d59b8a9d353c05365b867d12bc798cc171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 16:42:02 +00:00
TreeHugger Robot
8f07d18092 Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev 2022-08-10 16:17:49 +00:00
Linus Tufvesson
a173229e2f [automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev am: b6d3c1a021 am: d6b9cb3584 -s ours am: c9d18836c2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12b7cd63de8e25c16f89887a8d4e641c9e3ca57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 09:43:44 +00:00
Linus Tufvesson
d7e777c2c7 [automerger skipped] DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: c97296e9d9 am: 2b28fb61b6 -s ours am: e83cda5db2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac1fa01c15ec346a091f91285caf411dc5d62bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 09:43:31 +00:00
Linus Tufvesson
c9d18836c2 [automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev am: b6d3c1a021 am: d6b9cb3584 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31ef68598dfb54efb3f8ce0f73d7b6776903e6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 09:19:16 +00:00
Linus Tufvesson
e83cda5db2 [automerger skipped] DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: c97296e9d9 am: 2b28fb61b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7b290c1affe4693d8beb808506771fdb172290e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 09:18:53 +00:00
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
d6b9cb3584 Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev am: b6d3c1a021
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537069

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

Change-Id: I51090ef67905c994de084ecc9291e95b1f2cff85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 08:48:08 +00:00
Linus Tufvesson
b6d3c1a021 Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev 2022-08-10 07:59:57 +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
Linus Tufvesson
c97296e9d9 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-08 12:55:24 +02: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