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

144565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dingfeisong
64aaa1440a Remove all pending messages when fragment destroyed 
Remove all pending messages when the fragment has destroyed.
Otherwise, after fragment disattachs its context, an exception
will be reported when process the messages.

Bug:377166756

Change-Id: I333cedb45c0fe43b81abbfbe19e37f42f98def91
Signed-off-by: dingfeisong <dingfeisong@xiaomi.corp-partner.google.com>
 2024-11-04 13:40:27 +08:00
Jason Chiu
e13277caf5 Merge "Export App storage screen" into main 2024-11-04 03:57:06 +00:00
Treehugger Robot
f796239aa5 Merge "Fix catalyst settings test failure" into main 2024-11-04 02:05:59 +00:00
Jacky Wang
96aa9b27f1 Fix catalyst settings test failure 
NO_IFTTT=Catalyst only

Bug: 332201912
Flag: EXEMPT test
Test: atest
Change-Id: I064a63dfe075374fbbe7bee293d8efe70a91e473
 2024-11-04 06:30:36 +08:00
Jacky Wang
5329552b74 [Catalyst] Allow external SET for Display/Sound settings 
NO_IFTTT=Catalyst only

Bug: 360015496
Bug: 368359268
Flag: com.android.settings.flags.catalyst
Test: devtool
Change-Id: I61b2b4b78eba1ca41aa3e5cbfea41c0be9474d0b
 2024-11-04 04:15:39 +08:00
Jacky Wang
dbcdbe85e7 [Catalyst] Provide launch intent for Sound settings 
Bug: 360015496
Flag: com.android.settings.flags.catalyst_sound_screen
Test: devtool
Change-Id: Ifaf0a14d0b94682615400b2aec4f9c7cebc7794f
 2024-11-04 04:14:33 +08:00
Jacky Wang
d655faf940 Enable AutoBrightnessScreenTest 
NO_IFTTT=Enable test

Bug: 374712065
Flag: EXEMPT test
Test: atest
Change-Id: I1402bbf37644cb9b22aca6b9cae06306524a3b8f
 2024-11-04 04:14:09 +08:00
Jacky Wang
45f5ef607d [Catalyst] Proivde KeyValueStore for "Adaptive brightness" 
NO_IFTTT=Ignore test

Bug: 374712065
Flag: com.android.settings.flags.catalyst_screen_brightness_mode
Test: adb shell settings delete/get/put system screen_brightness_mode
Change-Id: I57b72082853493173648d4658d2f225121f68bbf
 2024-11-03 21:25:41 +08:00
Treehugger Robot
7d5ef590d0 Merge "[Catalyst] Migrate Adaptive brightness in the DisplayScreen" into main 2024-11-03 02:58:08 +00:00
Sunny Shao
369263156b [Catalyst] Migrate Adaptive brightness in the DisplayScreen 
Migrate the AutoBrightnessPreferenceController to be a Catalyst type preference.

Test: atest AutoBrightnessScreenTest
Bug: 374712065
Flag: com.android.settings.flags.catalyst_screen_brightness_mode
Change-Id: I80d17a4f7fae237825ab84d1f428614affcb9065
 2024-11-03 09:40:22 +08:00
Haijie Hong
559d39cc87 Merge "Allow launch activity from background for PendingIntent" into main 2024-11-01 08:21:06 +00:00
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
Riley Jones
400d90a0f6 Fixes searchability for timeout settings page. 
Bug: 352634232
Test: Manually install & veryfy conditions described in above bug
Flag: EXEMPT xml-only change
Change-Id: If0002a649952f45514d2e2971d742bb4cc1e1191
 2024-11-01 03:05:04 +00:00
Jason Chiu
859981242b Export App storage screen 
Fix: 375299013
Test: manual
Flag: EXEMPT only export activity
Change-Id: Id45b0639e00330eda85a61af31a2c307a14e85ff
 2024-11-01 09:58:27 +08:00
Joshua McCloskey
547dd4ebd8 Updated Orientation interactor 
Orientation interactor should now immediately give the result of the
orientation.

Test: Verified manually that the orientation is populated when the flow
is collected.
Flag: EXEMPT bugfix
Fixes: 376558183

Change-Id: I3726df57f50ad835f4b0f0768664cab2e7e64326
 2024-10-31 21:53:37 +00:00
Joshua McCloskey
5e2adc2683 Added interupt to accessibility interactor 
Test: Verified manually
Bug: 366219635
Flag: EXEMPT bugfix
Change-Id: If1dea7b3efd23e40c6c2668867b175ba84f11550
 2024-10-31 21:52:14 +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
Riley Jones
ce713f8cd3 Fixes searchability for autoclick settings page 
Bug: 352643805
Test: Manually install & veryfy conditions described in above bug
Flag: EXEMPT xml-only change
Change-Id: I6f20bc926ba9420b0f94ec41c5f32c49b26adc4c
 2024-10-31 19:26:03 +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