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

649573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
5d31eda995 Merge "Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."" into sc-dev 2022-08-11 00:54:09 +00:00
Yuri Lin
9ed0b1cc6e [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: a10aa3cc26 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Id28c8397cdbb1da5dcb2414a4029b701a57c36a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:34:58 +00:00
Julia Reynolds
5f6329c80a [automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff am: b953b5eff6 -s ours am: 1cb919e374 -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: Iab15f57066387644be45f281e53731bdd8071304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:34:30 +00:00
Julia Reynolds
3a3afbd571 [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours am: 8e552b10c7 -s ours am: d75bba0cec -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: I7c7301a52eb7d575eead7590f4e3bb8e2580b7ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:34:12 +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
46eea36112 [automerger skipped] Merge changes from topic "cherrypick-jr-owner-azffbn1bzv" into rvc-qpr-dev am: 935664ad48 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 34f2ef779b is already in history

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

Change-Id: I10f316020111bbff688153e6e11866f1c72cabe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:54:01 +00:00
Yuri Lin
8d65fed66a [automerger skipped] Enforce zen rule limit on a package level. am: 76c78aa2b0 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 34f2ef779b is already in history

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

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

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

Change-Id: I4ab3091bb0a561d77ca91688ee55eee0e81aeb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:52:10 +00:00
Thomas Stuart
3247344939 [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4 am: b680cef434 -s ours 
am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f42a is already in history

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

Change-Id: I8e133bce4302af314459f6df0e4ff4b520552fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:51:39 +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
Yuri Lin
bbc3447e3e Merge "Enforce zen rule limit on a package level." into sc-dev 2022-08-10 19:52:54 +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
f6d78a9691 [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: a173229e2f -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Idc5b836a072ec8ca0049a85a0a3123623cb9e1f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 10:29:17 +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
84402c0922 [automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into rvc-dev am: 69e4884a10 am: 97341f2b60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cfd5d8a3db00fbad4ff8fdb41164ff05e84a28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 09:35:22 +00:00
Linus Tufvesson
239f1de683 [automerger skipped] DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: 778191bdf2 am: 24f4ebf4a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idadf2ed1c880aaea434d2c8467c7e3b84d2a219b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 09:34:56 +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
Linus Tufvesson
d624bcc0cd Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into sc-dev 2022-08-10 07:58:26 +00:00
TreeHugger Robot
bcac19fd08 Merge "switch TelecomManager List getters to ParceledListSlice" into sc-dev 2022-08-09 22:58:34 +00:00
Oli Lan
93cb81e462 [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: 7cc9540c50 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I48b2c3ddbda597d7ab5f092a65d2a8bfe568b5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 11:28:45 +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
88e98e0a85 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 11:01:16 +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
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
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