PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,907 Commits 1 Branch 0 Tags
c05fe256c9991a15ee61baca0f05de718ce6cca1
Commit Graph

122907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bookatz
c05fe256c9 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours am: aa78945af2 -s ours 
am skip reason: contains skip directive

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

Change-Id: I38882aa6e84344d8cfd054e54a20d38b8d0176d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:53:19 +00:00
Treehugger Robot
16ee9ab16d [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 30d593d55f -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: Ib9f2c8e53f359470546344aebd9ee6f482eff4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:06 +00:00
Adam Bookatz
aa78945af2 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 9882f43d9c is already in history

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

Change-Id: Ic4da3cf7abf3928136a9d365179dd216b02fb61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:37:47 +00:00
Adam Bookatz
88f8eaecd6 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: Ide60dc82191b736ae1d1906d0b6ecd9808c7bc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:05 +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
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
e716dcdb41 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: I738257055d7155884ff8524f46d1edb25dda1dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:08 +00:00
Treehugger Robot
31af2ff68c Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev 2024-12-03 19:52:15 +00:00
Treehugger Robot
f07deaf5b4 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev 2024-12-03 19:51:15 +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
Jason Chiu
00a94388c6 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 0f1943ce36 -s ours am: 83b6988187 -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: I9eaacde8916a015d88f10fb0356fe29c22d53b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 06:22:09 +00:00
Jason Chiu
57ad521d75 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 165151052c -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: I08ddcbd24f4503a411e0189a863b559883452b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:51:04 +00:00
Jason Chiu
83b6988187 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 0f1943ce36 -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: If3217482ab16a3ea4ec93e9370784abf0fa30954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:49:59 +00:00
Jason Chiu
0f1943ce36 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: Ifd455d7dc5d6eb5834ad0437bb06d02459a95942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:26:40 +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
Jason Chiu
b5bf33ab76 Block the content scheme intent in AccountTypePreferenceLoader am: 8fa1dcb034 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469374

Change-Id: Ibc5350fee27a89cdf02d82d24bf4834931de4c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 04:04:39 +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
6e413c4cff 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:40 +00:00
Adam Bookatz
9882f43d9c 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:27 +00:00
Jason Chiu
8fa1dcb034 Block the content scheme intent in AccountTypePreferenceLoader 
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:47:06 +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
Bill Yi
9e6155da79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours 
am skip reason: contains skip directive

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

Change-Id: I159af6766d0fbf51263b7453a1f2ab749410277d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 00:25:02 +00:00
Bill Yi
56de354bdb Import translations. DO NOT MERGE ANYWHERE 
BUG:377687053

Auto-generated-cl: translation import
Change-Id: I05db00761923bf98f069ef14f4b89a56c8a812dc
 2024-11-13 22:43:37 +00:00
YK Hung
2901d2948e [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours 
am skip reason: contains skip directive

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

Change-Id: Icbb954270e7c17821ec59a147a66d1d7f8a06d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:16:22 +00:00
Jay Wang
954a3bd85a [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I4e528f792bc6b94934d0d35e5a8d8de4fe846f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:16:12 +00:00
YK Hung
5a5550e4e5 Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev 2024-11-13 13:57:53 +00:00
Jay Wang
9a91334dc9 RESTRICT AUTOMERGE Add battery replacement strings 
Bug: 376148038
Test: local test
Change-Id: I9d734e4c08da50fd018c512f767ad0432a175b86
 2024-11-13 03:19:12 +00:00
Treehugger Robot
b75fa80578 [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 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: I43ee65f9f7739548b03b7cccd3a136355dea7e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:26 +00:00
t
d9c410ea15 [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 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: I13f31143748e23c0aba37141587e56cdf340bae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:22 +00:00
Treehugger Robot
87b37d0b28 [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 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: I76a7af1286f198702228900d8d59af029fa16ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:09 +00:00
t
1876278fca [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 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: I8807c583d91a364385e77a715d9850e778b428d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:57:03 +00:00
t
374da97b52 [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 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: I964dc039f154d9da9963569610ba172cf11914f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:56:51 +00:00
Treehugger Robot
6a4398d516 [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 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: I719149f1cc2cbb42982fded76b2d460b55e49bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:32:03 +00:00
t
abaca3ca7f [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 98160a777b -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: I253259e6a976a9923e4ba10bbc2be9617a2a4f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:31:58 +00:00
Treehugger Robot
adc5cdff65 [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 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: I5a9882696db27639cd40f0d87f58eda7b1152b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:31:44 +00:00
t
f2b11f1a7b [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 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: I802c825302294e88f0ddf44e8fcc3ede44b509d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:31:37 +00:00
Treehugger Robot
b12551aad6 [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 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: Ieee3be192990648907999ddbe2bab08489c40c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:31:21 +00:00
t
5e20e352d9 [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 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: If43a5222b41db91734eb7af867b4a81abc63b386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:31:20 +00:00
t
8f55d65e04 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 13412879cc -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: I66d758bc3dc8bc00a2b6b916c0ebfcd8166f2f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:31:18 +00:00
Treehugger Robot
3e0290986f [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 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: I1d85938295d44fcb07e9c33f68ff6a04701e61ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:31:06 +00:00
t
0d3a30ca1b [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 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: I8b35218fb12596c37993244a401be375899fce3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:31:02 +00:00
t
9c42b1876f [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 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: Iac373a00d498c30cbfdc8a5d0636d2c1aeda39ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 17:30:48 +00:00
Treehugger Robot
941e1cadc4 [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: I844612da77f618e4f89d5f1c46053717ec7d9440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:42:36 +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