PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,143 Commits 1 Branch 0 Tags
47d52ebc569a9ae59d0410ec06579c5c46f7d31a
Commit Graph

105143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Dong
47d52ebc56 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours am: 717ffa9a1b -s ours am: 97e41c368d -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

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

Change-Id: Id484a05d7a7b12b22b642fae469fa4a39734bcfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:47:54 -08:00
Hao Dong
97e41c368d [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours am: 717ffa9a1b -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

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

Change-Id: Ief4cb39beb56bf1e156fff82d2ce3a5cee6044ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:24:17 -08:00
Hao Dong
717ffa9a1b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

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

Change-Id: Ia08a93b5cc97925c3411caa8bc362511d26f2fe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 11:10:39 -08:00
Hao Dong
596ca04d69 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: I65f0591d5cc3aaca0d4e88c7a7cd05993cbf334d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:55:22 -08:00
Hao Dong
9c190ed43b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: Ia6a803d7686a3eeff7a8912e429766f003d2beed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:55:17 -08:00
Hao Dong
66f8db84d6 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: I6379e2bc68a751a031c4c1f5ae821553096fecba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:35:56 -08:00
Hao Dong
19c298d5a9 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: Icdb092214251cff340514e664c57c23046e3c093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:35:50 -08:00
Hao Dong
a0b42f7f95 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev 2025-01-09 09:03:17 -08:00
Hao Dong
417970a8ca Set class name when createConfirmDeviceCredentialIntent() API is used. 
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
 2025-01-08 23:08:00 -08:00
Hao Dong
90fc883217 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982

Change-Id: Ie407bca1d30057b2f69330d22368d408ec3978ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-08 21:57:58 -08:00
Hao Dong
5b67d6e863 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev 2025-01-08 21:34:50 -08:00
Treehugger Robot
76c8e3526a [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours 
am skip reason: contains skip directive

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

Change-Id: I664bbd467b88dd3cf5bde24a2f4dd2a504631c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:04:50 +00:00
Adam Bookatz
9678e0dd04 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours 
am skip reason: contains skip directive

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

Change-Id: I809b51d4cbc558a697f53fc21b3c86b80865e7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:04:47 +00:00
Treehugger Robot
a5078949a1 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours 
am skip reason: contains skip directive

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

Change-Id: I99b873bd2df190b957d33a1e7ae0570b0c69efdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:04:36 +00:00
Adam Bookatz
647c3b30a7 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours 
am skip reason: contains skip directive

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

Change-Id: I7b7b90b04d1618b2a73887194c69cd92c743a5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:04:33 +00:00
Treehugger Robot
6f3dce1580 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie524f742e06fa9683476990c97690ad394a24ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:04:21 +00:00
Adam Bookatz
9608452666 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours 
am skip reason: contains skip directive

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

Change-Id: I1e17c654fad79b16bf26bca1092df62b1bf634b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:04:16 +00:00
Treehugger Robot
cfaac63123 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours 
am skip reason: contains skip directive

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

Change-Id: I2cf72fe9d591a6944472a201a95a8e6767916b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:09 +00:00
Adam Bookatz
20bee2e84b [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours 
am skip reason: contains skip directive

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

Change-Id: I951c78b82f0f8ffa45ca75f0f50f1bb7b45b672c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:04 +00:00
Treehugger Robot
3764a4cb26 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I4f9affde15cd4ed99d18ca92661dc6269f3c5285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:53 +00:00
Adam Bookatz
80f4a4d681 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie26bb795e1b0a2ae6e8e8e7a2d7a2db4245b9e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:47 +00:00
Treehugger Robot
329fd334c3 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours 
am skip reason: contains skip directive

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

Change-Id: Id24190cf6ed3742f08b7ec721565d397eb11985b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:36 +00:00
Adam Bookatz
1596e41a75 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours 
am skip reason: contains skip directive

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

Change-Id: I5f08938878d15cd7643146bd5879b65716c3b817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:29 +00:00
Treehugger Robot
b937941549 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev 2024-12-03 20:21:34 +00:00
Treehugger Robot
2112cc5ef9 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic50acb869e087908f40a44f2701d1a7c6c7a96d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:44 +00:00
Adam Bookatz
d5e5daf68e [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours 
am skip reason: contains skip directive

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

Change-Id: I1a9ae19f5ecee037bbb6e471ce175c1b4a53643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:38 +00:00
Treehugger Robot
24dc9f533a [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours 
am skip reason: contains skip directive

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

Change-Id: Ied614224826efe4e3dda2bcc6b4b9b3e8b704905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:18 +00:00
Adam Bookatz
1a45fcee73 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic6bdcdeaea0d4e7074f4469281126d33315abc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:11 +00:00
Treehugger Robot
30d593d55f Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Ia080e518c2170904c52fde02403ee63c9b55e8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:52 +00:00
Treehugger Robot
ad1e470fc0 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57 is already in history

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

Change-Id: I061448f1d049252139864636361c59710659f2ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:42 +00:00
Adam Bookatz
9d81e7d2e5 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57 is already in history

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

Change-Id: Ic5289feb780f3de57608de58b86d7250da337727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:39 +00:00
Adam Bookatz
39011f67c4 Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Iaa3e5c9dc2b5d0f677391e0b56c0c905cb553118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:37 +00:00
Treehugger Robot
8cfbd8aa9b Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev 2024-12-03 19:57:12 +00:00
Treehugger Robot
e0e72a57b7 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev 2024-12-03 19:45:29 +00:00
Treehugger Robot
ead69f3d43 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev 2024-12-03 19:31:03 +00:00
Jason Chiu
165151052c Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: I2d0b238f370336a83096683e8e92d8b03007333b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:26:25 +00:00
Jason Chiu
eff2f8b3e3 Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: Iae3f56de305617331d23ff759618eb2f065048be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:03:31 +00:00
Jason Chiu
f45744f85b Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: I2a1c33211ac87f310e95a066a9d2000773a75b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 04:29:49 +00:00
Jason Chiu
13b1a03e27 Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: Ica809bd3cb36961d20c5fd0f8dd035f6f7169a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 04:05:17 +00:00
Adam Bookatz
44a35ac07b Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:46 +00:00
Adam Bookatz
31e69deb28 Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:43 +00:00
Adam Bookatz
6f1c499e57 Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:36 +00:00
Adam Bookatz
4901c86b76 Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:33 +00:00
Jason Chiu
d782f9c4bc Block the content scheme intent in AccountTypePreferenceLoader 
Also prevent intent defined in AccountPreference from leaking access

Bug: 366401629
Flag: EXEMPT security fix
Test: atest AccountTypePreferenceLoaderTest, manual
Change-Id: Ica87087341cc983df04190919e33dc369fa18619
Merged-In: Ica87087341cc983df04190919e33dc369fa18619
(cherry picked from commit 841fb3846b)
 2024-11-19 10:45:58 +00:00
Treehugger Robot
3ee1da0bb3 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: Ie80a76fd76c5663d7f5865c5b150d2a86e50ba16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:42:36 +00:00
t
98160a777b [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: I83245d18fdfe0307bd05baf260571f9a7cf77413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:42:33 +00:00
Treehugger Robot
8b1a4a7284 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351 -s ours am: 8009906cb6 -s ours am: bd29320e54 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: I69da7ee3bcd804205cfce3c432bff6fb930ff647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:42:21 +00:00
t
d84a064bae [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: Ib100d8c28c99b79e12404502a3299461c5e1391b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:42:18 +00:00
t
24bed1e450 [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: If79e54816d2449ec36678c15fe1ed077e17df30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:42:07 +00:00
Treehugger Robot
772238abd6 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: I217c17af94f653ecc729fde5eb563fc027ebfc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:27:22 +00:00