PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,649 Commits 1 Branch 0 Tags
1135fa48e11b34b71a2fbea4044f3efbb3354954
Commit Graph

104649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shraddha Basantwani
1135fa48e1 Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686223

Change-Id: I6bc25fa953a90273e9bb412458e64361e6825e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-13 21:37:32 -08:00
Shraddha Basantwani
89b17839a5 RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686223

Change-Id: Ia4175025417fd2b0b4cc54a42a1d218dd46148cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-13 21:37:26 -08:00
Shraddha Basantwani
f313de51cf Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev 2025-02-13 21:13:39 -08:00
Shraddha Basantwani
6179d4fdf3 RESTRICT AUTOMERGE Add biometric authentication for package modification 
Add an extra step of Lock Screen for disabling, force-stopping or
uninstalling updates for protected packages

Bug: 352504490, 344865740
Test: atest AppButtonsPreferenceControllerTest
Flag: EXEMPT High Security Bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32e388ad3199de3c062bb2e2db5d3239f934d0eb)
Merged-In: I0c494e307b02229d751de118abcc89e4e61a6861
Change-Id: I0c494e307b02229d751de118abcc89e4e61a6861
 2025-02-12 01:36:35 -08:00
Matías Hernández
dbf59af214 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727

Change-Id: Ic9cbc10ea435cff9c5eb7b35b38257c868ce0b49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 03:36:07 -08:00
Matías Hernández
98fc4f2356 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev 2025-02-03 03:10:38 -08:00
Treehugger Robot
f8c6feffe5 Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: Ibe53a373f1598632bd16c1e2659644d28bb1f11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:24:32 -08:00
Treehugger Robot
969cb7728c Merge "Check the permission of the callingUid instead of the calling package" into tm-dev 2025-02-01 03:01:34 -08:00
Matías Hernández
2a6672dd33 Remove incorrect call to Window.addFlags with a system flag 
The same flag is being (correctly) added in onCreate, so on top of being wrong this was also completely unnecessary.

Bug: 368579654
Test: manual
Flag: EXEMPT bugfix

Change-Id: I539fca77a1d136bdd0e4892993020884430b8a4e
Merged-In: I539fca77a1d136bdd0e4892993020884430b8a4e
(cherry picked from commit e0510a62eb)
 2025-01-31 03:57:14 -08:00
Treehugger Robot
7fca233336 [automerger skipped] Merge "Add default Sound Picker package name" into sc-dev am: 3d8ba6008c -s ours am: 7cb1618980 -s ours am: 824728dc07 -s ours am: 629e93f0ca -s ours 
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb is already in history

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

Change-Id: I14b6f649f91105c6a411b01488fe8683a0f9f5d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 01:59:36 -08:00
Mill Chen
ece26c04f9 [automerger skipped] Add default Sound Picker package name am: b1e4cd09ff -s ours am: 345e6a1f4c -s ours am: 274974dc1a -s ours am: ee80b3073e -s ours 
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb is already in history

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

Change-Id: I16333ddd281884e53471dfcd7aaf971935c52085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 01:59:33 -08:00
Treehugger Robot
629e93f0ca [automerger skipped] Merge "Add default Sound Picker package name" into sc-dev am: 3d8ba6008c -s ours am: 7cb1618980 -s ours am: 824728dc07 -s ours 
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb is already in history

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

Change-Id: Iee7ece9d1a92a33dfd8542a778467a758c9aa0c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 01:35:34 -08:00
Mill Chen
ee80b3073e [automerger skipped] Add default Sound Picker package name am: b1e4cd09ff -s ours am: 345e6a1f4c -s ours am: 274974dc1a -s ours 
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb is already in history

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

Change-Id: I5d7aae6fa6b589023799cccb1db98fee0d88235b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 01:35:26 -08:00
Treehugger Robot
824728dc07 [automerger skipped] Merge "Add default Sound Picker package name" into sc-dev am: 3d8ba6008c -s ours am: 7cb1618980 -s ours 
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb is already in history

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

Change-Id: I8c59cf7bf9c4602d8e9314656eb2ddd803fb7f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 01:11:43 -08:00
Mill Chen
274974dc1a [automerger skipped] Add default Sound Picker package name am: b1e4cd09ff -s ours am: 345e6a1f4c -s ours 
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb is already in history

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

Change-Id: I43352613808ccf5adb73aedc24b577c9a4c1fa08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 01:11:38 -08:00
Treehugger Robot
b6276b4d18 [automerger skipped] Merge "Add default Sound Picker package name" into sc-qpr1-dev am: 52b5adcf0b -s ours am: 76d6e72d12 -s ours am: baf44d4c5f -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: Idfd4e3ce1257cdd9bdefa22a1a0ddc49d0943047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 01:11:25 -08:00
Mill Chen
786f599ba8 [automerger skipped] Add default Sound Picker package name am: cf52112bcb -s ours am: 85c25ba154 -s ours am: 97e4b8156b -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: Ida49755a6b78d1e282250f96b3b89135ae306737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 01:11:22 -08:00
Treehugger Robot
7cb1618980 [automerger skipped] Merge "Add default Sound Picker package name" into sc-dev am: 3d8ba6008c -s ours 
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb is already in history

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

Change-Id: Iaa979e773ab8fd4d82461de2a365f335c7c96138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 00:35:29 -08:00
Treehugger Robot
baf44d4c5f [automerger skipped] Merge "Add default Sound Picker package name" into sc-qpr1-dev am: 52b5adcf0b -s ours am: 76d6e72d12 -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: Ia52d126529923be937581ed7aad9b1683b11cc7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 00:35:26 -08:00
Mill Chen
345e6a1f4c [automerger skipped] Add default Sound Picker package name am: b1e4cd09ff -s ours 
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb is already in history

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

Change-Id: I48bab8116d6aae73e650a48e61d2e2ef014316ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 00:35:26 -08:00
Mill Chen
97e4b8156b [automerger skipped] Add default Sound Picker package name am: cf52112bcb -s ours am: 85c25ba154 -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: I00369f1eaa11d29216a321d5d7b514a8a972bc5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 00:35:19 -08:00
Treehugger Robot
3d8ba6008c Merge "Add default Sound Picker package name" into sc-dev 2025-01-10 00:21:55 -08:00
Treehugger Robot
76d6e72d12 [automerger skipped] Merge "Add default Sound Picker package name" into sc-qpr1-dev am: 52b5adcf0b -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: I19919a74d9d31c7e23df627c8bf5275343ab2537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-10 00:12:11 -08:00
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
52b5adcf0b Merge "Add default Sound Picker package name" into sc-qpr1-dev 2025-01-09 23:48:29 -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
2543e710f6 Merge "Add default Sound Picker package name" into sc-v2-dev 2025-01-09 23:11:16 -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
fa833f8136 Merge "Add default Sound Picker package name" into tm-dev 2025-01-09 22:04:41 -08:00
Hao Dong
7c0712690d [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 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: I949ed93bc6b83c0909a3cc52d6495ef547b9aec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 14:00:10 -08:00
Hao Dong
254a61da77 [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 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: Ieb758cbc1d9cf7f02cd21c03f344fa13f7f0fb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 14:00:04 -08:00
Hao Dong
7dfe8021fe [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 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: If7076b7c1854331e31c2fda98f2246af5c40ed53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 13:14:07 -08:00
Hao Dong
5c3a672d74 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours am: 3acc39816b -s ours am: 509c6a4896 -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: I880666de3baed94aaddada17aec708578a44bd58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 13:14:00 -08:00
Hao Dong
73064f1b5a [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe -s ours am: 559fb5441d -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: I6b00dc6d2d398566ecebb412232001c503eb883a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:48:23 -08:00
Hao Dong
509c6a4896 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours am: 3acc39816b -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: I5d74804a71344343abd92b6994ce1dd1a48451ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:48:19 -08:00
Hao Dong
8c4d5f0575 [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 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: Ifb24320444a5ebc88a1a99306b7091cbbdab8e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:47:40 -08:00
Hao Dong
d7aee3ecb3 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours am: 717ffa9a1b -s ours am: 97e41c368d -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: I63bf3d8c1a22edfba8c3cb48d3afcedaa4da1785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:47:36 -08:00
Hao Dong
559fb5441d [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe -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: Ie14dd66bdafd6afa7e31657915b9667b5325713a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:24:44 -08:00
Hao Dong
3acc39816b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -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: I01d93555887586edf46a97488c2b1126bf41b8a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:24:33 -08:00
Hao Dong
6f3bb938f7 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -s ours am: dc418ca7bf -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: I5fb4dc47e9ea8f38117d2b510f5d6af35a9cf2ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:24:23 -08:00
Hao Dong
97e41c368d [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours am: 717ffa9a1b -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: Ief4cb39beb56bf1e156fff82d2ce3a5cee6044ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:24:17 -08:00
Hao Dong
bc358528fe Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev 2025-01-09 11:55:41 -08:00
Hao Dong
dc418ca7bf [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -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: I37c51756eb2c8edd9ab4bac58210ada15acf502f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 11:10:42 -08:00
Hao Dong
717ffa9a1b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -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: Ia08a93b5cc97925c3411caa8bc362511d26f2fe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 11:10:39 -08:00
Hao Dong
aad0b6827b Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev 2025-01-09 10:37:25 -08:00
Hao Dong
901e7377cc [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -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: Id78bea040278ce2387b6ad844e112a37a2412424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:55:50 -08:00
Hao Dong
9cce9a26c7 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -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: I9cacdae71cb8cc67977e9e9ace2350cd4bb0ad93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:55:44 -08:00