Commit Graph

84317 Commits

Author SHA1 Message Date
Treehugger Robot
9fa4b1e0a6 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev 2023-07-06 21:18:12 +00:00
Treehugger Robot
6cf9c58fa5 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev 2023-07-06 21:15:44 +00:00
Treehugger Robot
e5f9ab14ce Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev 2023-07-06 19:53:12 +00:00
Matías Hernández
97ecfd35d6 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246

Change-Id: Ib2b171219769531b706b62ccb6759adeacc1129d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 17:57:31 +00:00
Matías Hernández
9eb2824be8 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246

Change-Id: Ib404f16baae58c5244ba61fe82974a1d93fa681a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 17:11:24 +00:00
Matías Hernández
42bd4d88c2 Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246

Change-Id: Iaf37229e9570c29792e801446e8db162ebb3dbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 16:25:28 +00:00
Matías Hernández
5985612633 Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724

Change-Id: I51744909a3ef6fcb1406dcc24d857d9b9eb88057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 09:29:06 +00:00
Matías Hernández
f0367c98d0 Settings: don't try to allow NLSes with too-long component names
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).

Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-19 09:58:28 +00:00
Matías Hernández
f1af8c5292 Settings: don't try to allow NLSes with too-long component names
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* NotificationAccessDetails -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).

Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-19 11:49:11 +02:00
Matías Hernández
b971690a4e [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581

Change-Id: I26937792ea087b7b2516e71525fa12602d312696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 14:26:51 +00:00
Matías Hernández
78a4048eac [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581

Change-Id: Ifee74173a3e0f410d4d76f06149b496a9ae62241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 13:40:43 +00:00
Matías Hernández
50df60c93c Don't hide approved NLSes in Settings am: ff255c6eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 12:57:15 +00:00
Matías Hernández
d7608c84b4 DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581

Change-Id: I11ee7cc3bfd291f32e602eff65ce93ba57bcc407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 12:52:41 +00:00
Taran Singh
27a97f4583 DO NOT MERGE: Prevent non-system IME from becoming device admin
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.

This CL ensures KeyEvent on "Activate" button can only come from system
apps.

Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e)
2023-06-07 21:12:08 +00:00
Taran Singh
0564ec25bb DO NOT MERGE: Prevent non-system IME from becoming device admin
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.

This CL ensures KeyEvent on "Activate" button can only come from system
apps.

Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e)
2023-06-07 18:29:05 +00:00
Matías Hernández
ff255c6eda Don't hide approved NLSes in Settings
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.

Bug: 282932362
Test: manual
Change-Id: I4c9faea68e6d16b1a4ec7f472b5433cac1704c06
2023-06-06 19:07:58 +02:00
Matías Hernández
173cc267e0 DO NOT MERGE Don't hide approved NLSes in Settings
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.

Bug: 282932362
Test: manual
Change-Id: Iccfe7b53d643d6c9f9516f91d3cee3309b11551e
2023-06-05 17:16:48 +00:00
Taran Singh
cb2b753094 DO NOT MERGE: Prevent non-system IME from becoming device admin
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.

This CL ensures KeyEvent on "Activate" button can only come from system
apps.

Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e)
2023-06-02 22:37:11 +00:00
Taran Singh
0ee3b96e59 DO NOT MERGE: Prevent non-system IME from becoming device admin
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.

This CL ensures KeyEvent on "Activate" button can only come from system
apps.

Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e)
2023-06-02 21:58:54 +00:00
Lin Yuan
062a9ca549 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Bug: 277333746
Bug: 277333781
Change-Id: I91aa143223d7d37751120aa9246bce4dc31a54a6
2023-04-25 19:24:13 +00:00
Lin Yuan
7591fff234 Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
2023-04-25 19:23:53 +00:00
Julia Reynolds
85c25d29d7 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648

Change-Id: I8124bdb6668bc43f275489abb311994ea69645db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 16:58:46 +00:00
Julia Reynolds
cfacc2acb8 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648

Change-Id: Ie11a802db36591d58289cd82956c5205f0893244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 16:28:40 +00:00
Julia Reynolds
8befc27425 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648

Change-Id: I8d1fa61e9c43c711725505554b464697f1f1ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 15:56:56 +00:00
Julia Reynolds
7c9190d25a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:43:18 +00:00
Julia Reynolds
ceb2d0400a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:25:32 +00:00
Julia Reynolds
cbb6811219 [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
Blank merge reason: Change-Id I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646

Bug: 260570119
Change-Id: I5b2a0e7a53697962ea7f3b70891f70d687936332
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:20 +00:00
Julia Reynolds
52a102cc2a Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:07 +00:00
Julia Reynolds
11ac41d9b6 Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 16:14:27 +00:00
Julia Reynolds
79cb59e618 Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 16:13:15 +00:00
Julia Reynolds
1f3969f615 Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 13:55:41 +00:00
Dmitry Dementyev
4f67ca0cfa Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I887d715a24724806bf20808ca91b6ed23d492b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 20:19:04 +00:00
Dmitry Dementyev
32813a2bef Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I859c957eb1f94bd9c5858b71c551a1e2e10b0468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 19:39:21 +00:00
Dmitry Dementyev
f56584cd21 Convert argument to intent in AddAccountSettings. am: c7e8052b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I83ab1d878491552ccb3ea1545742d1915fd8a6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 19:01:57 +00:00
Dmitry Dementyev
c7e8052b52 Convert argument to intent in AddAccountSettings.
Bug: 265798353
Test: manual
Change-Id: I0051e5d5fc9fd3691504cb5fbb959f701e0bce6a
2023-03-07 10:36:41 -08:00
Iavor-Valentin Iftime
89c9dc07df [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639

Change-Id: Icf801ae03384820cde40bf452e906720310b9c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:52:18 +00:00
Iavor-Valentin Iftime
91ade78763 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639

Change-Id: I5de53e483836d8324f70aba0ac3524ec0136e570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:16:16 +00:00
Iavor-Valentin Iftime
e116e63a91 Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639

Change-Id: I388da4ab1fed92f8afa92469e628f1324921df45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 17:40:55 +00:00
Iavor-Valentin Iftime
450cacbee4 Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev 2023-03-06 17:06:11 +00:00
Valentin Iftime
5fb0705664 [DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails
When using EXTRA_USER_HANDLE, check for INTERACT_ACROSS_USERS_FULL permission on calling package.

Bug: 259385017
Test: 1. Build a test app that creates and starts an intent to NOTIFICATION_LISTENER_DETAIL_SETTINGS while setting the intent extra  android.intent.extra.user_handle to UserHandle(secondaryUserId).
 2. Create and switch to a secondary user
Settings > System > Multiple users > Allow multiple users > Add user > Switch to New user
 3. Open Settings > Notifications > Device & app notifications and choose an app from the list (uses android.permission.BIND_NOTIFICATION_LISTENER_SERVICE). Enable Device & app notifications for selected app and disable all attributed permissions.
 4. Switch back to the Owner user.
 5. Get the userId of the secondary user: adb shell pm list users.
 6. Open the test app and enter the userId for the secondary user and the component name that uses android.permission.BIND_NOTIFICATION_LISTENER_SERVICE.
 8. In the settings window that open, enable all 4 sub-options.
 9. Switch to the secondary user and note that the all sub-options for the app are disabled.

Change-Id: I875b9f2fc32c252acdcf8374a14067836e0f1ac6
Merged-In: I875b9f2fc32c252acdcf8374a14067836e0f1ac6
2023-02-08 13:37:20 +00:00
Presubmit Automerger Backend
dbd4423d03 [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21298578

Bug: 259385017
Change-Id: I6c0a1f1167ad07d11c1eb85f93e8d7bd1ce6ba2b
2023-02-06 14:14:21 +00:00
Valentin Iftime
9a7bd79ca3 [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails
When using EXTRA_USER_HANDLE, check for INTERACT_ACROSS_USERS_FULL permission on calling package.

Bug: 259385017
Test: 1. Build a test app that creates and starts an intent to NOTIFICATION_LISTENER_DETAIL_SETTINGS while setting the intent extra  android.intent.extra.user_handle to UserHandle(secondaryUserId).
 2. Create and switch to a secondary user
Settings > System > Multiple users > Allow multiple users > Add user > Switch to New user
 3. Open Settings > Notifications > Device & app notifications and choose an app from the list (uses android.permission.BIND_NOTIFICATION_LISTENER_SERVICE). Enable Device & app notifications for selected app and disable all attributed permissions.
 4. Switch back to the Owner user.
 5. Get the userId of the secondary user: adb shell pm list users.
 6. Open the test app and enter the userId for the secondary user and the component name that uses android.permission.BIND_NOTIFICATION_LISTENER_SERVICE.
 8. In the settings window that open, enable all 4 sub-options.
 9. Switch to the secondary user and note that the all sub-options for the app are disabled.

Change-Id: I875b9f2fc32c252acdcf8374a14067836e0f1ac6
2023-02-06 14:14:12 +00:00
Jack Yu
9d643d3042 Only primary user is allowed to control secure nfc am: 0e57ff90cd am: c098bdcad0 am: 3ccadd2c97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458

Change-Id: I763baefc5b94776c0583273fe9ab47ae99e6a57c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 11:27:23 +00:00
Jack Yu
3ccadd2c97 Only primary user is allowed to control secure nfc am: 0e57ff90cd am: c098bdcad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458

Change-Id: I5690485d1cacd39b5b74316f561691bc68d48787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 10:10:20 +00:00
Jack Yu
c098bdcad0 Only primary user is allowed to control secure nfc am: 0e57ff90cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458

Change-Id: I35c94f779d47e27c170ec3b4becafc563f077a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 09:21:04 +00:00
Jack Yu
0e57ff90cd Only primary user is allowed to control secure nfc
Bug: 238298970
Test: manual
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
Change-Id: I945490ef1e62af479a732c9a260ed94bdd8bc313
2023-01-31 07:41:49 +00:00
Yanting Yang
8c70085bab [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685

Change-Id: Icc64822c71d77308f1c60911a4d6154815e05647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 05:02:49 +00:00
Yanting Yang
a617639496 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685

Change-Id: I54e4d0d1c79014920ddffe4a945423b624d10104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 04:30:33 +00:00
Yanting Yang
6326f5e65a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685

Change-Id: I390e1a3a8d8c683c604724571459ba7ebeccaf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:56:12 +00:00
Yanting Yang
f3d990e36d [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871703

Change-Id: I3a56150f056da9c1ecd77ea2e97d3196a0ca811c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:24:05 +00:00