PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
144,196 Commits 1 Branch 0 Tags
c994b58cc6019f5d38bb39dd0a86d16a40676525
Commit Graph

144196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chang
c994b58cc6 Merge "Change SUW theme style for Fingerprint and Face enrollment flow (3/n)" into main 2024-11-01 07:22:18 +00:00
Chaohui Wang
37915bcab2 Merge "Remove TelephonyManagerConstants" into main 2024-11-01 07:17:37 +00:00
Yomna ~
14b353fa76 Merge "Update flag namespace, names" into main 2024-11-01 03:49:28 +00:00
Bill Yi
0c2a08079f Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-11-01 03:14:24 +00:00
Bill Yi
fb59b4d641 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-11-01 03:14:24 +00:00
Bill Yi
4cdcfd4b89 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-11-01 03:14:24 +00:00
yomna
f55fbc4273 Update flag namespace, names 
Bug: 355062720
Test: m
Flag: com.android.settings.flags.mobile_network_security_2g_toggle
Flag: com.android.settings.flags.add_security_algorithms_to_eng_menu
Change-Id: I23e38b525f45ab520936427d8bf260cd4baf3c03
 2024-10-31 20:25:21 +00:00
Jason Chang
8f0c731fce Change SUW theme style for Fingerprint and Face enrollment flow (3/n) 
Apply SUW theme style for Fingerprint and Face enrollment flow

Flag: EXEMPT Using setup library's flag

Bug: 346562327

Test: manually build and perform a visual inspection.
Change-Id: Ia6c4c3dbc78f9ad82b7f503d39e883480b09a92d
 2024-10-31 20:11:01 +00:00
David Liu
2977bc7825 Merge "Migrate About phone" into main 2024-10-31 19:02:58 +00:00
Treehugger Robot
d56f414ee1 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 941e1cadc4 -s ours am: b12551aad6 -s ours am: b75fa80578 -s ours am: ec30e06a48 -s ours am: 1bb54bc2b5 -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: I548de20e9549bdd4285b98a5a3607550f0a0db59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:48:49 +00:00
t
5265ccc7c8 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 13412879cc -s ours am: 8f55d65e04 -s ours am: d9c410ea15 -s ours am: 872ffc61f6 -s ours am: f431b6cfff -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: Ie6e464f0b1451904efdbc0ff04b80ce5ecc34a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:48:45 +00:00
Treehugger Robot
8243b9db25 [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: cf2d79ba25 -s ours am: 3e0290986f -s ours am: 87b37d0b28 -s ours am: ceb4c429f7 -s ours am: 27a3d7bcd0 -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: I53a0f0217341a6464bf592d13c75c914d71d53a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:48:32 +00:00
t
556d72c8f5 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: 0543ab7266 -s ours am: 0d3a30ca1b -s ours am: 1876278fca -s ours am: 50704b30cd -s ours am: 581cd597f9 -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: Ifb2bc1363a435432a3af9fad7aee387c6fcd1e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:48:28 +00:00
t
dd0f9514ef [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: fbebc1cd0e -s ours am: 9c42b1876f -s ours am: 374da97b52 -s ours am: 156454b446 -s ours am: 08f4ad04d8 -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: Ia7016ebc5b47b52bfb2f2f65e25cc4b22445e3d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:48:17 +00:00
Treehugger Robot
b9b9e6f82d [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 3ee1da0bb3 -s ours am: 6a4398d516 -s ours am: c6a9dcc88e -s ours am: 6af387721c -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: Ief1efe6f5a00d7b98782c7cc0b3f99339b7f0151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:48:04 +00:00
t
f56188fc49 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 98160a777b -s ours am: abaca3ca7f -s ours am: c73c4ea6b2 -s ours am: 3d0ae76e5d -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: Ie1946299d100f62fe1700967e5306ca976efe3fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:47:59 +00:00
Treehugger Robot
917a26c8e2 [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: 8b1a4a7284 -s ours am: adc5cdff65 -s ours am: f72abbd437 -s ours am: 4d0d9525f4 -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: Iaef1e7ad417876477bec689c061d4b935ce1b490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:47:44 +00:00
t
b606f31589 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: d84a064bae -s ours am: f2b11f1a7b -s ours am: 2a186243a5 -s ours am: db82579a18 -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: Id085227d32f7a1e06f7d8af32c611e1abc8fc4e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:47:38 +00:00
t
b2ac732ce2 [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: 24bed1e450 -s ours am: 5e20e352d9 -s ours am: 72f4d4b1bf -s ours am: 1e96136b7d -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: Idd7a3a6ad3ec8af707ca023f60127a1235d35bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:47:24 +00:00
Treehugger Robot
428bf75c37 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 941e1cadc4 -s ours am: b12551aad6 -s ours am: b75fa80578 -s ours am: 9c5d3747e9 -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: I2e394339ff5b156896b8c1161248fc525dc68612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:15:25 +00:00
t
97a98041f8 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 13412879cc -s ours am: 8f55d65e04 -s ours am: d9c410ea15 -s ours am: 353742dbc2 -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: I1a9a9d954e1113ce61e41a5621c8064576feb09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:15:20 +00:00
Treehugger Robot
1bb54bc2b5 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 941e1cadc4 -s ours am: b12551aad6 -s ours am: b75fa80578 -s ours am: ec30e06a48 -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: Iff51d66f98fedd8dacbdf78bce74ca5ce94f8612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:15:11 +00:00
t
f431b6cfff [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 13412879cc -s ours am: 8f55d65e04 -s ours am: d9c410ea15 -s ours am: 872ffc61f6 -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: I7371ee2ab46a1b5dda8cd183fcfb85ed05816fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:15:08 +00:00
Treehugger Robot
d19174f39a [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: cf2d79ba25 -s ours am: 3e0290986f -s ours am: 87b37d0b28 -s ours am: d64bada48f -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: I9ecd9ac936214846ca4cc3a79bb7c8c9cc9b9113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:15:06 +00:00
t
bf0fbbb969 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: 0543ab7266 -s ours am: 0d3a30ca1b -s ours am: 1876278fca -s ours am: 2db840fd0a -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: Ie0fec8bb1f54406dd5f382ff184468ed066acb24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:15:01 +00:00
Treehugger Robot
27a3d7bcd0 [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: cf2d79ba25 -s ours am: 3e0290986f -s ours am: 87b37d0b28 -s ours am: ceb4c429f7 -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: Ie11d8981a5a3ee2be6c8973bcb6d348c5bf80cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:56 +00:00
t
581cd597f9 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: 0543ab7266 -s ours am: 0d3a30ca1b -s ours am: 1876278fca -s ours am: 50704b30cd -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: I70374e07edea7b847f18fdcec3a666c2b5e4c2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:53 +00:00
t
1d39e21d25 [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: fbebc1cd0e -s ours am: 9c42b1876f -s ours am: 374da97b52 -s ours am: 7f29447d2d -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: Ia402a29fe8734af4deb3673fb3e8a92d61e0b27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:48 +00:00
t
08f4ad04d8 [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: fbebc1cd0e -s ours am: 9c42b1876f -s ours am: 374da97b52 -s ours am: 156454b446 -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: I9ca6fa794f7596a029ea2784b3c06e2bc881b04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:43 +00:00
Treehugger Robot
926d0619a2 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 3ee1da0bb3 -s ours am: 6a4398d516 -s ours am: d3ec9f3e7e -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: Ie1a246ea9fb22dce469bfce43bce7fcecad652b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:36 +00:00
Treehugger Robot
6af387721c [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 3ee1da0bb3 -s ours am: 6a4398d516 -s ours am: c6a9dcc88e -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: I8fb2dbcffe97aaa9c24b921603f0bd58af14c136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:34 +00:00
t
3d0ae76e5d [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 98160a777b -s ours am: abaca3ca7f -s ours am: c73c4ea6b2 -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: I86241b257981caa03b2d3b4362cac7a645c19ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:31 +00:00
t
bc9c8605a2 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 98160a777b -s ours am: abaca3ca7f -s ours am: 4370890e0e -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: Ie8f6e31fd93b902c7210f62053365a04e38081fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:31 +00:00
Treehugger Robot
4d0d9525f4 [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: 8b1a4a7284 -s ours am: adc5cdff65 -s ours am: f72abbd437 -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: Id3f6c51ff83a9799a4aa4e277b42866e316702de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:22 +00:00
Treehugger Robot
055d355edc [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: 8b1a4a7284 -s ours am: adc5cdff65 -s ours am: 32a77b4b13 -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: I3bd32a5bfd4e71a36eabf96e44edd8653f4baee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:20 +00:00
t
db82579a18 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: d84a064bae -s ours am: f2b11f1a7b -s ours am: 2a186243a5 -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: I4fba9c5c125ddf689f854d360ec2629225dd6444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:19 +00:00
t
f270a2fd91 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: d84a064bae -s ours am: f2b11f1a7b -s ours am: 8a207feefe -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: I1b131bc22f5a19cd2b57e1caef6925781f76c904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:14 +00:00
t
1e96136b7d [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: 24bed1e450 -s ours am: 5e20e352d9 -s ours am: 72f4d4b1bf -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: Iccd3db212d7abf8cff2c4c9e75be4f18245cafe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:14:08 +00:00
t
9deb6baf5e [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: 24bed1e450 -s ours am: 5e20e352d9 -s ours am: c5db4ec9bc -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: If75577818640e8825e2ecc580616d831162e154e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 18:13:58 +00:00
Treehugger Robot
9c5d3747e9 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 941e1cadc4 -s ours am: b12551aad6 -s ours am: b75fa80578 -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: I668f5845e640c21684c2c2f1f530bd483d3b23a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:58:00 +00:00
Treehugger Robot
ec30e06a48 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 941e1cadc4 -s ours am: b12551aad6 -s ours am: b75fa80578 -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: I8c7b7876da29c061106123bf1e78ac8c4a07eb9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:58:00 +00:00
t
353742dbc2 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 13412879cc -s ours am: 8f55d65e04 -s ours am: d9c410ea15 -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: I75f1acf0e2a82be384b47078e66d8034956710b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:57 +00:00
t
872ffc61f6 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 13412879cc -s ours am: 8f55d65e04 -s ours am: d9c410ea15 -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: I1c1a8403eda9ec1697ece4abb84a720ade75c528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:56 +00:00
Treehugger Robot
d64bada48f [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: cf2d79ba25 -s ours am: 3e0290986f -s ours am: 87b37d0b28 -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: I1f5a48d16e2ab3e478f77fdd48c6922c3c6c5248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:48 +00:00
Treehugger Robot
ceb4c429f7 [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: cf2d79ba25 -s ours am: 3e0290986f -s ours am: 87b37d0b28 -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: I246276bcbdb3531fbbbea20431ea7244b6a5902c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:46 +00:00
t
2db840fd0a [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: 0543ab7266 -s ours am: 0d3a30ca1b -s ours am: 1876278fca -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: Iba3d3b5a9a4b07e50aa7c2554867280f2c818b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:45 +00:00
t
50704b30cd [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: 0543ab7266 -s ours am: 0d3a30ca1b -s ours am: 1876278fca -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: I315adc32a5f0068265e7db72ec270ec69bc8386d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:44 +00:00
t
7f29447d2d [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: fbebc1cd0e -s ours am: 9c42b1876f -s ours am: 374da97b52 -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: I698f8ac57efbd90e5499ea48d1b649c2631a3b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:38 +00:00
t
156454b446 [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: fbebc1cd0e -s ours am: 9c42b1876f -s ours am: 374da97b52 -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: I06a96a876b34113da3b0929063a4426fdafcbc22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:35 +00:00
Treehugger Robot
d3ec9f3e7e [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 3ee1da0bb3 -s ours am: 6a4398d516 -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: Ia80674b60e0c5513e24702c2c777980e2860d52b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:30 +00:00