PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,975 Commits 1 Branch 0 Tags
cf4ee7be4c760d313a8ee918c4df0c23472521ff
Commit Graph

118975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
cf4ee7be4c Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property 
Future WM Jetpack library updates will ask for the property to
enable ActivityEmbedding feature.

Bug: 264733035
Test: build pass
Change-Id: I0f5e5a10250049fb9425eac7c113b803b6701cc7
 2023-01-09 10:26:07 +08:00
Yanting Yang
a65999cc60 [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: b01c6e3525 -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: I86d55d56ed28609d36ad975dfea93d2bafc77a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 06:50:00 +00:00
Yanting Yang
d677e17b5d [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: a25b0242a4 -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: I0696e5d729af7d446b1f32029137a8ca0a4d28e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 06:49:06 +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
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
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
2ecddcaf9f [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: ef9b1c5a55 -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: I45436a01578d80777d770e416b60355a77d9e1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:21:07 +00:00
Yanting Yang
9665f09929 [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: 17fe8736eb -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: Id2a7117d7c962363a08ad8b38f95e4d508d59ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:20:39 +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
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
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
579da68f9a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: 5dbaf208f0 -s ours am: a262c1f821 -s ours am: abfd6640f7 -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: Id18893af5f1d795717f91fee21de1cda3972b903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:15:37 +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
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
TreeHugger Robot
d6905dd6ce Merge "[Battery usage U] [UI] Show total "Screen On Time" in the battery usage page" 2023-01-07 03:22:46 +00:00
TreeHugger Robot
95497baf4e Merge "Fix the inverted logic to judge whether an app is system app." 2023-01-07 03:20:08 +00:00
Yanting Yang
8b91e2b218 [automerger skipped] Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev am: f43feb6a46 am: 2ab25b8b96 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 18e77f27aa is already in history

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

Change-Id: I76dddb9ab8dd069752c6db977b79c658ad77b6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:12:03 +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
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
TreeHugger Robot
f730f899d8 Merge "Add Extra Exception Checks to Null Cipher Toggle" 2023-01-06 21:49:22 +00:00
Becca Hughes
c84d77cdf5 Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64 am: da53b2912c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: I645c29b608373dcb31f8dc183da7b220d6bb46c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:58:24 +00:00
Bill Yi
275c53dc15 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours am: 8f67dfd0c6 -s ours am: c768c92641 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ecf30fabfec9a056f80eb07443ab1879d5e410a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:49:00 +00:00
Bill Yi
be438c6332 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours am: 9be6f23a0c -s ours am: d00c17ec81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bd783c7da4583d3fe5d99c204c82b82d3c3613f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:48:16 +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
Becca Hughes
ce5d029670 Merge "Add credential manager team to OWNERS" 2023-01-06 20:03:13 +00:00
Bill Yi
8f67dfd0c6 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -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: I3051eb6db0fcb1e3ac1e2300f18461a297f789b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:00:49 +00:00
Bill Yi
9be6f23a0c [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -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: I07d24876a3be08444cb4660b280565679cb5ab04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:00:02 +00:00
Bill Yi
2e7924abcf Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:51 +00:00
Gil Cukierman
58f946072d Add Extra Exception Checks to Null Cipher Toggle 
Adds broad exception safety to all TelephonyManager calls.
Without these extra catch blocks, the entire Settings app would
crash if a TelephonyManager API were to throw an exception.

Bug: 262914591
Test: atest NullAlgorithmsPreferenceControllerTest
Change-Id: I997a37fe71bf007d67989c89b3abe3e520d79d3c
 2023-01-06 19:30:26 +00:00
Bill Yi
238b7b4620 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2681d8cc05 -s ours am: 2d50872f81 -s ours 
am skip reason: subject contains skip directive

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

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