Commit Graph

146252 Commits

Author SHA1 Message Date
Mill Chen
85c25ba154 [automerger skipped] Add default Sound Picker package name am: cf52112bcb -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 94681e3436 is already in history

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

Change-Id: I599e85926f8d5ad9d1a23497b625bbac887ff3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-10 00:12:08 -08:00
Treehugger Robot
eebbed928c [automerger skipped] Merge "Add default Sound Picker package name" into sc-v2-dev am: 2543e710f6 -s ours am: 122466050a -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 be15ba86a7 is already in history

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

Change-Id: I3c3a365d33c6a8392d68d81fdca8386aed1b3561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:59:19 -08:00
Mill Chen
1aa0fd60a2 [automerger skipped] Add default Sound Picker package name am: 94681e3436 -s ours am: d0dd552cae -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 be15ba86a7 is already in history

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

Change-Id: Ib034218cd55a47ad0b9eadc6c2bc6a408fb63616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:59:14 -08:00
Treehugger Robot
2e14ad3c10 [automerger skipped] Merge "Add default Sound Picker package name" into sc-v2-dev am: 2543e710f6 -s ours am: 122466050a -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 be15ba86a7 is already in history

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

Change-Id: Ib22276891a4f1bb1451e68cbc665466e99f4cc75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:58:57 -08:00
Mill Chen
4cf4ce1d82 [automerger skipped] Add default Sound Picker package name am: 94681e3436 -s ours am: d0dd552cae -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 be15ba86a7 is already in history

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

Change-Id: I432f0a0f06e9f182d8f76042062b304109003ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:58:53 -08:00
Treehugger Robot
52b5adcf0b Merge "Add default Sound Picker package name" into sc-qpr1-dev 2025-01-09 23:48:29 -08:00
Treehugger Robot
cbf92c4af0 [automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136 am: 0881c66d1d -s ours am: 0a5c1919fe -s ours am: 8e9bb7a08c -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 89a32bb7d2 is already in history

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

Change-Id: I81e61896a97f01db10db78593b1cdf92f2604f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:48:10 -08:00
Treehugger Robot
122466050a [automerger skipped] Merge "Add default Sound Picker package name" into sc-v2-dev am: 2543e710f6 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 be15ba86a7 is already in history

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

Change-Id: I1117576137e58b7bd642289cddb1e9009f92db00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:36:34 -08:00
Mill Chen
d0dd552cae [automerger skipped] Add default Sound Picker package name am: 94681e3436 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 be15ba86a7 is already in history

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

Change-Id: I2e1f56d739bd4fcd68a08227979cd738df8ab149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:36:26 -08:00
Treehugger Robot
8e9bb7a08c [automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136 am: 0881c66d1d -s ours am: 0a5c1919fe -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 89a32bb7d2 is already in history

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

Change-Id: Ief5dfac74d5bbeb8d72cb1e0d6c18e01a50b21ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:18:46 -08:00
Treehugger Robot
2543e710f6 Merge "Add default Sound Picker package name" into sc-v2-dev 2025-01-09 23:11:16 -08:00
Treehugger Robot
532439a757 Merge "[Catalyst] Update DataChangeReason usages to PreferenceChangeReason" into main 2025-01-09 23:07:49 -08:00
Treehugger Robot
0a5c1919fe [automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136 am: 0881c66d1d -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 89a32bb7d2 is already in history

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

Change-Id: I5f18c151a7b994291c94bbe65acd5c14c08ff977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:00:20 -08:00
Mill Chen
da769d7521 [automerger skipped] Merge "Add default Sound Picker package name" into tm-qpr-dev am: 4188f571c4 -s ours am: 537a4c967d -s ours am: 2e455acd00 -s ours am: a91265ae87 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 7a2366b0f1 is already in history

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

Change-Id: Ifbf485fda208098ae40c3823ff254e15e8134866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:00:15 -08:00
Mill Chen
f01d8f2d49 [automerger skipped] Add default Sound Picker package name am: 89a32bb7d2 -s ours am: ac230a2ea6 -s ours am: 0d14990001 -s ours am: 1e043956ad -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 7a2366b0f1 is already in history

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

Change-Id: I04eb76de488462c768809f8cbc88277d41df0051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 23:00:11 -08:00
Mill Chen
a91265ae87 [automerger skipped] Merge "Add default Sound Picker package name" into tm-qpr-dev am: 4188f571c4 -s ours am: 537a4c967d -s ours am: 2e455acd00 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 7a2366b0f1 is already in history

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

Change-Id: I4fe858655324e930b799062f66efa11c43fe9199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 22:36:15 -08:00
Mill Chen
1e043956ad [automerger skipped] Add default Sound Picker package name am: 89a32bb7d2 -s ours am: ac230a2ea6 -s ours am: 0d14990001 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 7a2366b0f1 is already in history

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

Change-Id: I16e616f8bbcbb109dfb303db5ba374c7be14efb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 22:36:10 -08:00
Treehugger Robot
6608cb542f Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31043662

Change-Id: I7e0ac5552f3a8498ec7c6c4aff47a68dd2932066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 22:35:38 -08:00
Treehugger Robot
0881c66d1d Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31043662

Change-Id: I78309c6663f6437177a08310bdeb226f208a4072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 22:35:18 -08:00
Treehugger Robot
fa833f8136 Merge "Add default Sound Picker package name" into tm-dev 2025-01-09 22:04:41 -08:00
Mill Chen
2e455acd00 [automerger skipped] Merge "Add default Sound Picker package name" into tm-qpr-dev am: 4188f571c4 -s ours am: 537a4c967d -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 7a2366b0f1 is already in history

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

Change-Id: Ic56754a34e54c2388b0d14fef15f88102cb5cfc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 21:58:12 -08:00
Mill Chen
0d14990001 [automerger skipped] Add default Sound Picker package name am: 89a32bb7d2 -s ours am: ac230a2ea6 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 7a2366b0f1 is already in history

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

Change-Id: I8c3cdb137e941e84f175a71d8df79ec9b8640765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 21:58:06 -08:00
Mill Chen
e5e015199c [automerger skipped] Merge "Add default Sound Picker package name" into udc-dev am: 0370bdfc84 am: d2d2fe12a4 -s ours am: ffe9009fea -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 354e1faf76 is already in history

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

Change-Id: I0bb40226ce6980a3a60fc92a1a02257743850a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 21:36:26 -08:00
Mill Chen
537a4c967d [automerger skipped] Merge "Add default Sound Picker package name" into tm-qpr-dev am: 4188f571c4 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 7a2366b0f1 is already in history

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

Change-Id: Ib8ab489bc59d8179d7526421f8820f8aa1a49fd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 21:35:22 -08:00
Mill Chen
ac230a2ea6 [automerger skipped] Add default Sound Picker package name am: 89a32bb7d2 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 7a2366b0f1 is already in history

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

Change-Id: Ifddd7c748bb07a5a429c5031f3171edb78af3e5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 21:35:14 -08:00
Mill Chen
4188f571c4 Merge "Add default Sound Picker package name" into tm-qpr-dev 2025-01-09 21:15:04 -08:00
Mill Chen
ffe9009fea [automerger skipped] Merge "Add default Sound Picker package name" into udc-dev am: 0370bdfc84 am: d2d2fe12a4 -s ours
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 354e1faf76 is already in history

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

Change-Id: I17cb353b60f4bea4accb1beea449960ddf25b64c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 21:12:42 -08:00
Ze Li
d6f13bc516 Merge "[Temp bonding] Block users to select temp bond device as primary device for call in "Call audio" under "Audio sharing" page" into main 2025-01-09 20:51:59 -08:00
Mill Chen
d2d2fe12a4 Merge "Add default Sound Picker package name" into udc-dev am: 0370bdfc84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31077732

Change-Id: Ia91ea5e0d6baa02662428f98a5b731cfa4e17ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 20:46:08 -08:00
Mill Chen
0370bdfc84 Merge "Add default Sound Picker package name" into udc-dev 2025-01-09 20:25:14 -08:00
Fan Wu
4ca85b1e5c [Catalyst] Update DataChangeReason usages to PreferenceChangeReason
Bug: 388677104
Test: atest and manual
Flag: EXEMPT refactor
NO_IFTTT=refactor
Change-Id: I3c1aae3dc10a1c78e1b2b0ead8ffc83da933e174
2025-01-09 20:03:09 -08:00
Treehugger Robot
f48f0573e1 [automerger skipped] Merge "Add default Sound Picker package name" into udc-qpr-dev am: 70943e0295 -s ours
am skip reason: Merged-In Ie19cbceb89842a75a180898abcce81b63c18d46c with SHA-1 0bd014c497 is already in history

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

Change-Id: Ib3d3052501aa0c4b0c8d4796ceeee2b817c10f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 19:00:47 -08:00
Mill Chen
d3e342065c [automerger skipped] Add default Sound Picker package name am: 354e1faf76 -s ours
am skip reason: Merged-In Ie19cbceb89842a75a180898abcce81b63c18d46c with SHA-1 0bd014c497 is already in history

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

Change-Id: Ibec0e0db85ab34dd51a4055b19883c6ccd3f1ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 19:00:42 -08:00
Treehugger Robot
70943e0295 Merge "Add default Sound Picker package name" into udc-qpr-dev 2025-01-09 18:39:51 -08:00
Wenyu Zhang
aea94181aa Merge "a11y: Initialize slider position with cursor area size setting" into main 2025-01-09 17:58:57 -08:00
Chris Antol
2000e9f96c Fix sensitivity to writability declarations
Bug: 388877875
Test: N/A - CTS test to follow
Flag: com.android.settingslib.flags.settings_catalyst
Change-Id: I32d92b427bafe474f0e082923603781ad561cdd8
NO_IFTTT=sensitivity level not a field in legacy Preference Controller
2025-01-09 17:19:55 -08:00
Hao Dong
e1e5d19534 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe -s ours am: 559fb5441d -s ours am: 73064f1b5a -s ours am: 7dfe8021fe -s ours am: ccd5352873 -s ours am: 6c58b8c6ba -s ours am: 2137e86b86 -s ours am: 253161184a -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

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

Change-Id: Ic6dcaae0e00216c6c0ea151fbc4141baf4f0baf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 16:13:26 -08:00
Hao Dong
0854e91b38 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours am: 3acc39816b -s ours am: 509c6a4896 -s ours am: 5c3a672d74 -s ours am: 6d3a58cecc -s ours am: d0652e1b9d -s ours am: 6d9c40c53a -s ours am: 587d4db8d5 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

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

Change-Id: If1f3bbc77750c24f1a567508b12c7f9ce4d5906d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 16:13:21 -08:00
Hao Dong
253161184a [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe -s ours am: 559fb5441d -s ours am: 73064f1b5a -s ours am: 7dfe8021fe -s ours am: ccd5352873 -s ours am: 6c58b8c6ba -s ours am: 2137e86b86 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

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

Change-Id: I5d781a878db46ff9c99866caf80240eb5099e020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 15:48:34 -08:00
Hao Dong
587d4db8d5 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours am: 3acc39816b -s ours am: 509c6a4896 -s ours am: 5c3a672d74 -s ours am: 6d3a58cecc -s ours am: d0652e1b9d -s ours am: 6d9c40c53a -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

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

Change-Id: I7f889c561f55850c055a2fec9d55c0d85e09de08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 15:48:31 -08:00
Jacky Wang
1c78d48489 Merge "Fix memory leak on Accessibility screen" into main 2025-01-09 15:25:19 -08:00
Hao Dong
2137e86b86 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe -s ours am: 559fb5441d -s ours am: 73064f1b5a -s ours am: 7dfe8021fe -s ours am: ccd5352873 -s ours am: 6c58b8c6ba -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

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

Change-Id: Ib7431592ccc481dbc2e8b864fc8bc767fc077320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 15:20:58 -08:00
Hao Dong
6d9c40c53a [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours am: 3acc39816b -s ours am: 509c6a4896 -s ours am: 5c3a672d74 -s ours am: 6d3a58cecc -s ours am: d0652e1b9d -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

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

Change-Id: I19c95c427e89ce5fbfb1d0bf8980b3d1109dbda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 15:20:54 -08:00
Hao Dong
0dda4dc59e [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -s ours am: dc418ca7bf -s ours am: 6f3bb938f7 -s ours am: 75137218b1 -s ours am: f8e44f03e7 -s ours am: 834ecda7b3 -s ours am: 3d06e1bc64 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

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

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

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

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

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

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

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

Change-Id: I596acefe144dfc3bc5a7f7b5c20816fa73b32af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 14:41:07 -08:00
Hao Dong
b85bfeb537 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 90fc883217 -s ours am: ba4746f0fe -s ours am: 6ebe81fd07 -s ours am: cac4ef6cf0 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a is already in history

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

Change-Id: I28db2ebe215f1692ffaf2cc42baee666019d5fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 14:38:58 -08:00
Hao Dong
6c58b8c6ba [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe -s ours am: 559fb5441d -s ours am: 73064f1b5a -s ours am: 7dfe8021fe -s ours am: ccd5352873 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

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

Change-Id: Ic84cfab414f022b6fb0b466a9bd4956d1b5246d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 14:38:01 -08:00
Hao Dong
d0652e1b9d [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours am: 3acc39816b -s ours am: 509c6a4896 -s ours am: 5c3a672d74 -s ours am: 6d3a58cecc -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

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

Change-Id: I417a1b994920a0786e9596a1a3b974501e2db5e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 14:37:55 -08:00