PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,909 Commits 1 Branch 0 Tags
06151a58c6cad27394c607765cb56b4d2aa31a4c
Commit Graph

125909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
06151a58c6 Merge "[SPA] Add biometric authentication for package modification" into udc-qpr-dev 2025-02-04 20:46:20 -08:00
Matías Hernández
adf9bed8e8 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: dbf59af214 am: 6e347e2da2 -s ours am: 64b322af00 -s ours am: 088e57a6ae -s ours 
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 2a6672dd33 is already in history

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

Change-Id: Id4169c53e7ed6d66c32ea6700d17c89e99210df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 05:10:32 -08:00
Matías Hernández
d85a1ca8a8 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: c2c7c0d984 -s ours am: 8a9a9fd424 -s ours am: 01fbb2e467 -s ours 
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 c97cd9e805 is already in history

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

Change-Id: I9c40e01170b38f8529e1d026841f4e5f85663007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 05:10:21 -08:00
Matías Hernández
088e57a6ae [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: dbf59af214 am: 6e347e2da2 -s ours am: 64b322af00 -s ours 
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 2a6672dd33 is already in history

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

Change-Id: I512edb860208ecaa5bcd6286bbe8bcc2c590e091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 04:55:27 -08:00
Matías Hernández
64b322af00 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: dbf59af214 am: 6e347e2da2 -s ours 
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 2a6672dd33 is already in history

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

Change-Id: I2a6cdfeda9d4e5ee1cbeae153d045307f9f431d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 04:44:54 -08:00
Matías Hernández
01fbb2e467 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: c2c7c0d984 -s ours am: 8a9a9fd424 -s ours 
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 c97cd9e805 is already in history

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

Change-Id: I0c99a21951a03734c9ac1c92b973b739c9830edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 04:44:25 -08:00
Matías Hernández
8a9a9fd424 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: c2c7c0d984 -s ours 
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 c97cd9e805 is already in history

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

Change-Id: I5ab047ebeafc9ac13f7f674ca9047189dd9ffb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 04:12:02 -08:00
Matías Hernández
6e347e2da2 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: dbf59af214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727

Change-Id: I41492e7b420b14aac7dd658cc604d337a3abb137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 04:10:32 -08:00
Matías Hernández
f1f74e26c2 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev am: 4a584df0c4 am: 04cbe370a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31172435

Change-Id: I5ec88479adeaf240e7df61673b73ba54c5b3d202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 03:48:07 -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
c2c7c0d984 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: I7234cc71c93f69f44b8d05bee2169cf297064ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 03:35:54 -08:00
Matías Hernández
04cbe370a1 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev am: 4a584df0c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31172435

Change-Id: I0f51099793d0e2bece4989e59583533191f6a561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 03:23:22 -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
Matías Hernández
4a584df0c4 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev 2025-02-03 02:57:39 -08:00
Treehugger Robot
638c49a6b2 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours am: 055febeeb4 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

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

Change-Id: I1768ef92573048039bd41e33d025e8656f680aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:19:05 -08:00
Treehugger Robot
055febeeb4 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

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

Change-Id: Ie55525fb0bf7c3ae6fb7c1f4a24cf29edefaf190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:15:36 -08:00
Treehugger Robot
ce8bc299bf [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours am: 1451c50e5a -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: I448da232ef6f34776c5a6004b056b4ecb28878a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:07:43 -08:00
Treehugger Robot
8852d1464c [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours am: 3cd2d3b8fe -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: If70682d5bf713b0792d63f339be6015c27070fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:07:34 -08:00
Fan Wu
a0a32c32dd [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours am: 44ed327b4c -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: I6a09f83e08b791ca0ab3a012de25c1b4a78d9216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:07:30 -08:00
Treehugger Robot
4df8ee0043 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649 am: c9a7157c71 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 201d7ffac4 is already in history

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

Change-Id: I33192a50d4d49ed38bf3693af58514cb72c98795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:07:21 -08:00
Treehugger Robot
c6f3f33258 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

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

Change-Id: I85e500ef02493fd5a37336b8b983312979e4e407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:06:05 -08:00
Treehugger Robot
1451c50e5a [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: Ib018070849f9cfdd309ccad457d300f635601e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:04:22 -08:00
Treehugger Robot
8984963099 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: I4821f3d369279bb44b031895e32fead87de95382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:52:18 -08:00
Treehugger Robot
55de28ad5f [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

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

Change-Id: I213e8ca7c014faa461b47da068ef777882aaddf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:50:46 -08:00
Treehugger Robot
3cd2d3b8fe [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: Ica7cf1e1a8660b9c295bdb051e0ebb780266c56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:48:29 -08:00
Fan Wu
44ed327b4c [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: Ia03cc7dca52005f828351b222dcb6de3b67e16f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:48:23 -08:00
Treehugger Robot
c9a7157c71 Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833

Change-Id: I81c8a012a24619ecae995394561022a79fb28ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:48:10 -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
78f62d8269 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: I8e37a5fa6f1b917128963457f18046d8540476dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:24:23 -08:00
Fan Wu
81a5d7b696 [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours 
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: I98d55f743c385681f5a0d8d43dc516852c8a8cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:24:17 -08:00
Treehugger Robot
007a226ba9 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: I7d226da8aef1c0823738324cd064c7ff96e0ecf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:24:14 -08:00
Treehugger Robot
54ee76b649 Merge "Check the permission of the callingUid instead of the calling package" into udc-dev 2025-02-01 03:09:33 -08:00
Treehugger Robot
b9c5239b5b Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev 2025-02-01 03:04:56 -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
Treehugger Robot
6cd8230cbb Merge "Check the permission of the callingUid instead of the calling package" into udc-qpr-dev 2025-02-01 02:58:50 -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
Shraddha Basantwani
891d4be094 [SPA] 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 PackageInfoPresenterTest
Flag: EXEMPT High Security Bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32e388ad3199de3c062bb2e2db5d3239f934d0eb)
Merged-In: I0c494e307b02229d751de118abcc89e4e61a6861
Change-Id: I0c494e307b02229d751de118abcc89e4e61a6861
 2025-01-22 21:16:55 -08:00
Treehugger Robot
b9fe162f05 [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: 7fca233336 -s ours am: 36865a5751 -s ours am: df4d22f184 -s ours am: e834ae431d -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: I2957e5d82bb7a9eddc9a5593005e4fa4b021dc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 13:01:09 -08:00
Mill Chen
33ca80108f [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: ece26c04f9 -s ours am: e79d063755 -s ours am: 3c1918c941 -s ours am: 69bc34d144 -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: Ibc4f4184e2fc30d1d57727f5590fa19ea58bfda6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 13:01:04 -08:00
Treehugger Robot
f658361f31 [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: b6276b4d18 -s ours am: 22f338e161 -s ours am: 768999cad4 -s ours am: e8d093b64d -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: I3d49e1523737ea8339b498872e261127e5da860e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 13:00:44 -08:00
Mill Chen
0692379e51 [automerger skipped] Add default Sound Picker package name am: cf52112bcb -s ours am: 85c25ba154 -s ours am: 97e4b8156b -s ours am: 786f599ba8 -s ours am: be6d3de6be -s ours am: 0a93ced740 -s ours am: f17bcecb1b -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: I35cd7ea04790809a3e55917b364dfd1db39e8a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 13:00:36 -08:00
Treehugger Robot
309b40603e [automerger skipped] Merge "Add default Sound Picker package name" into sc-v2-dev am: 2543e710f6 -s ours am: 122466050a -s ours am: eebbed928c -s ours am: 69f63f44a0 -s ours am: 8b97d6b8a5 -s ours am: b5228b5360 -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: I0b0be1822ee7a9c5919a741370970b0921d029d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:56:51 -08:00
Mill Chen
5a3347dc2f [automerger skipped] Add default Sound Picker package name am: 94681e3436 -s ours am: d0dd552cae -s ours am: 1aa0fd60a2 -s ours am: 0f40040391 -s ours am: 7444cfa7dd -s ours am: 3a5017386d -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: Ib82be1d3362e46fea8e29fd2838fe6d56f551835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:56:42 -08:00
Treehugger Robot
7159ce70e2 [automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136 am: 6608cb542f -s ours am: d601d2ef19 -s ours am: 0eb554fb17 -s ours am: 9a2fd9afc5 -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: I08ee3313f2872e5fd73ae14eca6eee52ffedb771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:55:57 -08:00
Hao Dong
8c0855dcaa [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: 7c0712690d -s ours am: 60e00959b1 -s ours am: e71bb309ce -s ours am: 01a7a51708 -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: I31d1c208e36edf7cfadf1ab388421dc40a670b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:54:49 -08:00
Hao Dong
515af80bc9 [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: 254a61da77 -s ours am: ab3c46447c -s ours am: 9608d3384c -s ours am: 60e8203c45 -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: Ic04223174732f5c633bf8a55af0452dc9068c9e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:54:40 -08:00
Hao Dong
2744527e63 [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: 8c4d5f0575 -s ours am: fd697a8b25 -s ours am: 1f4dbc2c07 -s ours am: 8d9f96e522 -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: I12876a58884ea4882b15f4878680250834663e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:53:41 -08:00
Hao Dong
bc73940b4f [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours am: 717ffa9a1b -s ours am: 97e41c368d -s ours am: d7aee3ecb3 -s ours am: 5610a1295e -s ours am: ddc286e72c -s ours am: 421660fa47 -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: I01875ba12e0851db453d46f8f663a82217d58d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:53:37 -08:00
Hao Dong
b7427f3980 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours am: 901e7377cc -s ours am: 1017ec16c0 -s ours am: b7c547504a -s ours am: 4599f41227 -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: Iac10cf6a7ba03c2d60e06e64cc7548b20de5eaf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:52:23 -08:00
Hao Dong
9fe74b4c21 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours am: 9cce9a26c7 -s ours am: a6b7b2ac39 -s ours am: d33c418fed -s ours am: ed9321374b -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: Id68daabb207f0b18e57d65c86fb06cf440868cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-16 12:52:17 -08:00