Commit Graph

111505 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
6d0bd58e7f Snap for 9465878 from 30783964b3 to tm-qpr2-release
Change-Id: I1e8465e635a753efadc8e991c726923f8e9522e3
2023-01-07 22:30:13 +00:00
Betty Chang
f0b70510d8 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 am: ddeff2f67f -s ours am: 30783964b3 -s ours
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I292f88e40c9e6228dd6395fa6f6be4cf896ce4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 09:09:10 +00:00
changbetty
3afa2f08f2 [automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 am: 7888fcc82b -s ours am: e7f0596113 -s ours
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: Id7b72ef1e840e8c401d5167691d892fc54fa56de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 09:09:06 +00:00
Betty Chang
30783964b3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 am: ddeff2f67f -s ours
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I0fbd5e7104445bc1f4176c56522b335870b1c7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 08:39:48 +00:00
changbetty
e7f0596113 [automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 am: 7888fcc82b -s ours
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I6c0fb65c5ce73586624b75929a6992bc3a58a4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 08:39:46 +00:00
Betty Chang
ddeff2f67f Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713

Change-Id: I66295604e4413f7c6d9a1067abeab07b14eeae63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 08:01:20 +00:00
changbetty
7888fcc82b [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713

Change-Id: I3b67d30e794dd06a689c57c9fd6b948bbea362f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 08:01:18 +00:00
Yanting Yang
ab4cd3acdf [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: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -s ours am: 618af44b70 -s ours am: d0c69f7ae7 -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: I49a24450f1b28aa4e0767757a9e8eaabb5f3aab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 07:57:50 +00:00
Betty Chang
9cb6a08d16 Merge "Change the intent flag to immutable" into tm-qpr-dev am: cfc1569f12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20802849

Change-Id: Iaf38ffd1366880869dfb9bbda3e9e57aea337b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 07:57:39 +00:00
Yanting Yang
d0c69f7ae7 [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: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -s ours am: 618af44b70 -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: I87141bf0fba2bd6b66fe0fa59377138271e0576f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 07:24:10 +00:00
Betty Chang
145d91b832 Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev 2023-01-07 07:23:30 +00:00
Betty Chang
cfc1569f12 Merge "Change the intent flag to immutable" into tm-qpr-dev 2023-01-07 07:23:02 +00:00
Yanting Yang
618af44b70 [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: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -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: Ida9886743b149f43cab923e5f56778065e7e04b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 06:49:11 +00:00
Yanting Yang
b01c6e3525 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours am: f3d990e36d -s ours am: 9038a26635 -s ours am: 36a4373792 -s ours am: 0e2bf4c870 -s ours am: 7396023ddb -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: I1330dd790442b749e6ca919284f02446e85ca813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 06:08:17 +00:00
Yanting Yang
b842d569bf [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: 8c70085bab -s ours am: b1391d7eb2 -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: I4160c9fba6190b73af1d9b18ce90975b99eb38e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 06:08:06 +00:00
Yanting Yang
a25b0242a4 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours am: adc9a200ac -s ours am: 46c8caa6cc -s ours am: b2943c3888 -s ours am: fac442ae58 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Ie4f7da8a7c35d5e0310964af09b023491d8c22c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 06:08:03 +00:00
Yanting Yang
7396023ddb [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours am: f3d990e36d -s ours am: 9038a26635 -s ours am: 36a4373792 -s ours am: 0e2bf4c870 -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: I4c5ba7e1963c08e7d695fb86bca0fdcbd61c67e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 05:36:40 +00:00
Yanting Yang
b1391d7eb2 [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: 8c70085bab -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: I17851351e33f65ae9ae187114fe73358c0dfecc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 05:36:33 +00:00
Yanting Yang
fac442ae58 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours am: adc9a200ac -s ours am: 46c8caa6cc -s ours am: b2943c3888 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: I12feb4c19f82efcbb56b23925abb0ab6712a31ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 05:36:31 +00:00
Yanting Yang
0e2bf4c870 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours am: f3d990e36d -s ours am: 9038a26635 -s ours am: 36a4373792 -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: I6b2e3322b8f8a77ab8662d357c0aa3883872207d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 05:06:03 +00:00
Yanting Yang
b2943c3888 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours am: adc9a200ac -s ours am: 46c8caa6cc -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: I6f24cab1ae2f1768077ff8231588dc2b44d7584d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 05:05:56 +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
ef9b1c5a55 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours am: accde42e7d -s ours am: 140bcebdb2 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: Id1e4f03de3c6d87e99d9d5b65c8c067b915abb66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 04:47:26 +00:00
Yanting Yang
17fe8736eb [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours am: 615f13120c -s ours am: 3e8931d5b0 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: Ic6ca08a3b3643e4820319954b429e22b5986a8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 04:47:16 +00:00
Yanting Yang
36a4373792 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours am: f3d990e36d -s ours am: 9038a26635 -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: Iee799fc77384e15c10a0a7f15cde1e0637389dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 04:30:41 +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
46c8caa6cc [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours am: adc9a200ac -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Ib323120650a042e24732c749b6b5521894299af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 04:30:29 +00:00
Yanting Yang
140bcebdb2 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours am: accde42e7d -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I05d44ca0d4aae5afcbcf7b81172db4f65239f1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 04:15:51 +00:00
Yanting Yang
3e8931d5b0 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours am: 615f13120c -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: Ie91293bee1f3f096f5599b0c43fc5f8bd0c2551c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 04:15:45 +00:00
Yanting Yang
9038a26635 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours am: f3d990e36d -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: I7cfb933ca1c82100996120520e228e765955d7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:59:56 +00:00
Yanting Yang
adc9a200ac [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Id63a2ff11919abe62c0dbcaa5fbe17f10212ce89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:59:49 +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
accde42e7d [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I6dc5bcd9b40c5f565ec370ca99cea68a5d4ea528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:43:31 +00:00
Yanting Yang
615f13120c [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: I98957aa0f4c8108d6cad7b3beb4bef5a47821a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:43:26 +00:00
Yanting Yang
abfd6640f7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: 5dbaf208f0 -s ours am: a262c1f821 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 f3b323e378 is already in history

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

Change-Id: I82653afb955c201451a6262c0afb2390d3cb29d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:40:49 +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
Yanting Yang
1b30190fe1 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Id6ea47451afaeccfa879791583a880c1986acc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:23:59 +00:00
Yanting Yang
3594b1e412 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -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: I1b23667c48d00bb5e33cd2d3f96ee6ba3d0ee438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:23:36 +00:00
Yanting Yang
3fefcb236a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: Ieac19e01cf73c5861992714c7602e4c88ea87c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:23:31 +00:00
Yanting Yang
f54f57f1a7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I3ee17f055872b9ad8929c3a07f70a12646040939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:10:14 +00:00
Yanting Yang
a262c1f821 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: 5dbaf208f0 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 f3b323e378 is already in history

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

Change-Id: Idb0ba09a9aab296d27698c29c04c976332331925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:10:08 +00:00
Yanting Yang
33186e2f03 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: I45654cc46309d8051f06a0b6082d38a04e612196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:06:36 +00:00
Yanting Yang
5dbaf208f0 Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871702

Change-Id: Ic9875331fa1a63feee2d51c4782e8c98df882794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 02:34:52 +00:00
Yanting Yang
2ab25b8b96 Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev am: f43feb6a46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871682

Change-Id: I884e3ce1ba968181da190fbf2ec1196f4894c4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 02:32:19 +00:00
Android Build Coastguard Worker
6e293be0d9 Snap for 9463735 from 2681d8cc05 to tm-qpr2-release
Change-Id: I1f37a882b6ff1f5f38dfcba4e2080a8fb9a9342f
2023-01-07 02:25:47 +00:00
Yanting Yang
f43feb6a46 Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev 2023-01-07 01:56:05 +00:00
Becca Hughes
da53b2912c Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: I0f6b895cf2ac1a2294eafdad6f15c825bb4ead5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:28:41 +00:00
Bill Yi
c768c92641 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours am: 8f67dfd0c6 -s ours
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: If86bfe3c232a6fab682b6dad9fb4dd2f0a7a9d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:27:07 +00:00
Bill Yi
d00c17ec81 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours am: 9be6f23a0c -s ours
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I8499b724c8500edf9129a1f612b97f756defd1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:26:04 +00:00
Becca Hughes
5b7dc67d64 Merge "Add credential manager team to OWNERS" am: ce5d029670
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: If599c23c05ab5eaf4a80a4b3a4acd0f3c6f78cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:05:01 +00:00