Commit Graph

141578 Commits

Author SHA1 Message Date
songferngwang
f554e16f45 Add more condition to avoid to open the SimOnboardingActivity
when the user inserts the psim, showing the sim onboarding for the user to setup the sim switching or the default data subscription in DSDS.
Will show dialog for below cases.
1. the psim slot is not active.
2. there are one or more active sim.

Bug: 348524643
Test: verify the UI
Flag: EXEMPT bugfix
Change-Id: I3c782fa2486fde25ac15a69b48ba2f07f90572bd
2024-06-26 10:48:32 +00:00
Chaohui Wang
67d977b72e Merge "Clean up MobileNetworkRepository.DataRoamingObserver" into main 2024-06-25 09:37:01 +00:00
Chelsea Hao
06feb6d1f7 Merge "[Audiosharing] Test getInstance for states" into main 2024-06-25 07:52:35 +00:00
Chaohui Wang
3e393d0a46 Merge "Fix Talkback can focus on blank area" into main 2024-06-25 06:51:12 +00:00
chelseahao
954d027917 [Audiosharing] Test getInstance for states
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostream
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: Ic0f143b427966dfa039fca3bd0028e0c6f7382ab
2024-06-25 14:29:19 +08:00
Chaohui Wang
b183f3732c [automerger skipped] Fix Apn network type tests am: ad93026e3b -s ours
am skip reason: Merged-In Ib5bd331e9a28e89e426bf423e6086d1c2d288961 with SHA-1 288b40ee4f is already in history

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

Change-Id: I80399aa2093afcc9705d859247d2a82a836b1790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-25 05:41:56 +00:00
Treehugger Robot
7ee88983f5 Merge "When received Carrier Config Change, refresh UI." into main 2024-06-25 05:31:31 +00:00
Chaohui Wang
a23c53c9a9 Fix Talkback can focus on blank area
By hiding radio button frame instead of just radio button.

Fix: 347185801
Flag: EXEMPT bug fix
Test: manual - on ApnSettings
Change-Id: I7a2ba536f037a6cd014989bba1374d034169d90b
2024-06-25 13:26:12 +08:00
Chaohui Wang
b132ed91b1 Clean up MobileNetworkRepository.DataRoamingObserver
Bug: 348118234
Flag: EXEMPT clean up
Test: manual - on Mobile Settings
Change-Id: If9e7ed7cde0d7864ff00d135339a7725de179f1b
2024-06-25 12:12:41 +08:00
Treehugger Robot
aba2d057d6 Merge "Enable 16kb tests on general-tests suite" into main 2024-06-25 03:22:03 +00:00
Julien Desprez
e4087bf29f Enable 16kb tests on general-tests suite
This doesn't need to be built on device side.

Flag: TEST_ONLY
Test: https://android-build.corp.google.com/builds/abtd/run/L50300030004790194
Bug: 342232954

Change-Id: I86493e8d197ca6acc24743e44b63a764bf4d36df
2024-06-25 02:56:04 +00:00
Automerger Merge Worker
ffcb87daee [automerger skipped] Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2 -s ours am: ad31e0b966 -s ours am: a9feb359fb -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I39ede79391c58c90cc34f31d41043b4b5105506b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:52 +00:00
Chris Antol
2a8cac1d9d [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 694378b3da -s ours am: 0e02726c4e -s ours am: 68c24becb6 -s ours am: a2532a531a -s ours am: a5ca471ced -s ours
am skip reason: contains skip directive

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

Change-Id: I0f67071e988b7b20c8124ae24e6bafe99d0359d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:46 +00:00
Chris Antol
03d2ef33cf [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 4b9488fe71 -s ours am: 40cd7fb097 -s ours am: 664b99002b -s ours am: 095f81b067 -s ours
am skip reason: contains skip directive

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

Change-Id: I58fcfbfec8df2e48183e20cd90244534413544d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:32 +00:00
Chris Antol
a013a93bb9 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours am: 248f8b8d9f -s ours am: 26e556ab9e -s ours am: 2f7c96eb1b -s ours am: 7f52694f16 -s ours am: f6952b2253 -s ours
am skip reason: contains skip directive

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

Change-Id: I5294101aae7d980880133b44aa4db623b6a8c71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:27 +00:00
Automerger Merge Worker
12c6fb720d [automerger skipped] Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6 -s ours am: 94e3511650 -s ours am: 2c67b3834c -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: Id8674cc2754226b454a76874af540a55f0341820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:13 +00:00
Chris Antol
7283591b8f [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 59b6740a52 -s ours am: 6fce978ab9 -s ours am: 62a2fae07c -s ours am: 9e499d615c -s ours am: 06a2d06948 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie789ea5a6a80d43ddbdf479d02f62afa464c0b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:25:07 +00:00
Chris Antol
598324b80f [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 9bf862fefb -s ours am: 7a00bca567 -s ours am: 0dabe1aef2 -s ours am: 32e3f4c000 -s ours
am skip reason: contains skip directive

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

Change-Id: I068db50439677349af3011e71d51d2a6725edf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:24:51 +00:00
Chris Antol
7463161926 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours am: 744e414e26 -s ours am: 454b89c0fe -s ours am: bb5472786a -s ours am: 49fe4c4c72 -s ours
am skip reason: contains skip directive

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

Change-Id: If19842134e9d8961047665c828efee6d7d911667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:24:46 +00:00
Chris Antol
e03ed33d3e [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: 63e3d91b32 -s ours am: 822c7c26ee -s ours am: 62e7a84486 -s ours am: 39c3f50de1 -s ours am: 86f8f8f00c -s ours
am skip reason: contains skip directive

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

Change-Id: I57a90e921164392777bb6802972ddf486fd7f16b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:24:32 +00:00
Chris Antol
4502ebf1ac [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: c909913f89 -s ours am: 1ff5669883 -s ours am: 5c4fb5b7e5 -s ours am: 22eda1c131 -s ours am: ac6322f252 -s ours
am skip reason: contains skip directive

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

Change-Id: I62619a81f1be5d249a9733eb890f058e6ecec8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:24:28 +00:00
Chris Antol
b003845fa9 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: de606472d0 -s ours am: 697b9a5bd7 -s ours am: 9e02caf4d0 -s ours am: 17946789f0 -s ours
am skip reason: contains skip directive

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

Change-Id: Ibc3dd41ff86be7a002f70ed4a5e818c8a22a52ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:24:10 +00:00
Chris Antol
229bb6d5de [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: 964534a7bb -s ours am: 3f9075453e -s ours am: b57c17e1de -s ours am: b4a06997e4 -s ours
am skip reason: contains skip directive

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

Change-Id: I2b86f90cf25c111c1785aab1d6900995a163b250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:24:05 +00:00
Automerger Merge Worker
e8e4f98f1b [automerger skipped] Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2 -s ours am: b9543bc95b -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I5e374ca3ac32239dd81f9c2166a5891fbba8a666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:09:29 +00:00
Chris Antol
8c6765e511 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 694378b3da -s ours am: 0e02726c4e -s ours am: 68c24becb6 -s ours am: 8dfba0ca1d -s ours
am skip reason: contains skip directive

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

Change-Id: Id85e406a65d3cf488d360837a6689c4dcd4eea47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:09:25 +00:00
Automerger Merge Worker
a9feb359fb [automerger skipped] Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2 -s ours am: ad31e0b966 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I391770ddec007a39e01126e6aa47f84ea7814e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:09:15 +00:00
Chris Antol
a5ca471ced [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 694378b3da -s ours am: 0e02726c4e -s ours am: 68c24becb6 -s ours am: a2532a531a -s ours
am skip reason: contains skip directive

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

Change-Id: If8ef705d36779514a11effc050d20b7076b2211c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:09:11 +00:00
Chris Antol
00e387027b [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 4b9488fe71 -s ours am: 40cd7fb097 -s ours am: 160a36de5b -s ours
am skip reason: contains skip directive

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

Change-Id: If11653f071be5d8abdc660f464366cbf3b23c242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:09:06 +00:00
Chris Antol
16a37938d2 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours am: 248f8b8d9f -s ours am: 26e556ab9e -s ours am: 2f7c96eb1b -s ours am: 76ba8cb3b3 -s ours
am skip reason: contains skip directive

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

Change-Id: I71713bfdf7982d8b43eae0a1ed3df85e48e04c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:09:01 +00:00
Chris Antol
095f81b067 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 4b9488fe71 -s ours am: 40cd7fb097 -s ours am: 664b99002b -s ours
am skip reason: contains skip directive

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

Change-Id: I6ca4a44d69cf1238ba0a9383c368cf09ab5c46d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:53 +00:00
Chris Antol
f6952b2253 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours am: 248f8b8d9f -s ours am: 26e556ab9e -s ours am: 2f7c96eb1b -s ours am: 7f52694f16 -s ours
am skip reason: contains skip directive

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

Change-Id: I9e3264da35ac1843921bddaba1f6be472083de2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:49 +00:00
Automerger Merge Worker
705e469950 [automerger skipped] Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6 -s ours am: b94744475e -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I1d52f4fe8566afbe91db5048e96b7f9ff8277e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:46 +00:00
Chris Antol
9328f62ca1 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 59b6740a52 -s ours am: 6fce978ab9 -s ours am: 62a2fae07c -s ours am: 416f28c7a0 -s ours
am skip reason: contains skip directive

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

Change-Id: I3e05a25e7123e18617ceb753ea789841d828d29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:42 +00:00
Automerger Merge Worker
2c67b3834c [automerger skipped] Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6 -s ours am: 94e3511650 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I771ce6878b29f30154220a2bfb72d647578b9138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:38 +00:00
Chris Antol
06a2d06948 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 59b6740a52 -s ours am: 6fce978ab9 -s ours am: 62a2fae07c -s ours am: 9e499d615c -s ours
am skip reason: contains skip directive

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

Change-Id: Ifd28163f59f07120dbe24b183f828725347a3037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:35 +00:00
Chris Antol
6fcdccb7fb [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 9bf862fefb -s ours am: 7a00bca567 -s ours am: 537bfdc768 -s ours
am skip reason: contains skip directive

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

Change-Id: I166d96c71bb6844ad6d4852be6c65ac05fa8f41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:18 +00:00
Chris Antol
32e3f4c000 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 9bf862fefb -s ours am: 7a00bca567 -s ours am: 0dabe1aef2 -s ours
am skip reason: contains skip directive

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

Change-Id: Idbd5d62e4aed05c985bdd00bda0dd2935004788a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:16 +00:00
Chris Antol
49fe4c4c72 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours am: 744e414e26 -s ours am: 454b89c0fe -s ours am: bb5472786a -s ours
am skip reason: contains skip directive

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

Change-Id: I3ae3ee868e97abcd5412c071ab1d65296c6fed13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:13 +00:00
Chris Antol
be6dbdf12a [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours am: 744e414e26 -s ours am: 454b89c0fe -s ours am: 0f2cae569b -s ours
am skip reason: contains skip directive

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

Change-Id: Id542a71dd83626af1d421d4dfe338cf26664311f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:13 +00:00
Chris Antol
86f8f8f00c [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: 63e3d91b32 -s ours am: 822c7c26ee -s ours am: 62e7a84486 -s ours am: 39c3f50de1 -s ours
am skip reason: contains skip directive

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

Change-Id: I0ea0899e75acab23c0a6476bbb37792c1e731e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:08:01 +00:00
Chris Antol
ac6322f252 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: c909913f89 -s ours am: 1ff5669883 -s ours am: 5c4fb5b7e5 -s ours am: 22eda1c131 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia39098b1d96c09f1eb333432195a5b6c2c604a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:07:58 +00:00
Chris Antol
d480b00694 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: 63e3d91b32 -s ours am: 822c7c26ee -s ours am: 62e7a84486 -s ours am: 328f5e4828 -s ours
am skip reason: contains skip directive

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

Change-Id: Iba236d997a81e6cc53b304f0d62c249cd507b6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:07:56 +00:00
Chris Antol
56eeb6ecee [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: c909913f89 -s ours am: 1ff5669883 -s ours am: 5c4fb5b7e5 -s ours am: 986e4151bb -s ours
am skip reason: contains skip directive

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

Change-Id: If02e4701a6657ec1a0338398c9e1d703b5788ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:07:52 +00:00
Chris Antol
17946789f0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: de606472d0 -s ours am: 697b9a5bd7 -s ours am: 9e02caf4d0 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic0567b10bf6ebcdbcfdc0adda41090bf29674097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:07:46 +00:00
Chris Antol
b4a06997e4 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: 964534a7bb -s ours am: 3f9075453e -s ours am: b57c17e1de -s ours
am skip reason: contains skip directive

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

Change-Id: I5b8b80c7491e98d42815cd98cf4be41736c86519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:07:42 +00:00
Chris Antol
5af61fee88 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: de606472d0 -s ours am: 697b9a5bd7 -s ours am: 8c7d72ffa7 -s ours
am skip reason: contains skip directive

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

Change-Id: I1ccdc8711c72d88ee257fe673b1696c00d0c9b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:07:35 +00:00
Chris Antol
e0c1232b5b [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: 964534a7bb -s ours am: 3f9075453e -s ours am: 9c94f4604e -s ours
am skip reason: contains skip directive

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

Change-Id: Ibe3f2bd829e88fdc99d750bf3836c978bf8866f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 21:07:30 +00:00
Automerger Merge Worker
ad31e0b966 Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I71797d8bc0864ef2fc79aca1b32603088d82496d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:58:29 +00:00
Chris Antol
a2532a531a [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 694378b3da -s ours am: 0e02726c4e -s ours am: 68c24becb6 -s ours
am skip reason: contains skip directive

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

Change-Id: I924da8cd391674c7e0b6e4cd6f60ca2131425c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:58:25 +00:00
Chris Antol
664b99002b [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours am: 4b9488fe71 -s ours am: 40cd7fb097 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia5ca7b92b657110ebc1e49d6aa9ff17da440e31f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:58:08 +00:00