Guojing Yuan
ccce5d5dd5
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I1cbe0436ee22c9793566f862c1b5d2b58f03c8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 12:28:47 -07:00
Guojing Yuan
219079c50b
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I15292b0ac9a408454e079642ce652737bd490ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 11:56:32 -07:00
Guojing Yuan
14629c9d47
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev
2025-03-12 11:22:03 -07:00
Shraddha Basantwani
ba7d8ce77e
[automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf
am: 1135fa48e1
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 0634208161
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686223
Change-Id: I326918d24e14962639e02937fc1087ed5801cf9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-20 21:47:14 -08:00
Shraddha Basantwani
b3a57ea2c2
[automerger skipped] RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3
am: 89b17839a5
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 0634208161
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686223
Change-Id: Ie578507a82660b462a2141e5a3a1c38b2e0a6532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-20 21:47:09 -08:00
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
Guojing Yuan
b0fce927bf
[CDM] Checks NLS component name instead of package name
...
Bug: 386216637
Flag: EXEMPT bugfix
Test: CTS
Change-Id: I1be52fcb3d52b8b84353ea00fd57d8360ddd966c
Merged-In: I1be52fcb3d52b8b84353ea00fd57d8360ddd966c
(cherry picked from commit f5ed187ffb
)
2025-02-13 11:54:35 -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
Shraddha Basantwani
f459d4073b
Merge "Add biometric authentication for package modification" into tm-qpr-dev
2025-02-09 21:48:53 -08:00
Shraddha Basantwani
0634208161
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-09 20:25:50 -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
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
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
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
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
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
36865a5751
[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 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: I76b7de5bde86cb82ef29492c40e0edc0db887c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:48:09 -08:00
Mill Chen
e79d063755
[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 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: I85f577ce38aed775bde711689c8677f81dc04a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:48:06 -08:00
Treehugger Robot
22f338e161
[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 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: Ife51922eb59c570d96cc9de7873cb63a0ce30142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:44:49 -08:00
Mill Chen
be6d3de6be
[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 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: I8c859957c66fefed1cf5256896f80f0e63cf9172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:44:45 -08:00
Treehugger Robot
69f63f44a0
[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 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: I445939d38bc2cd07ccdbb2850bff5e6d38dff2dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:44:22 -08:00
Mill Chen
0f40040391
[automerger skipped] Add default Sound Picker package name am: 94681e3436
-s ours am: d0dd552cae
-s ours am: 1aa0fd60a2
-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: I6ec3242887982e0f02040ccf5dc1de7307128025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:44:19 -08:00
Treehugger Robot
d601d2ef19
[automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136
am: 6608cb542f
-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: I07c64e5faf1a3e7cd523e390a67acf15017c6edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:42:36 -08:00
Hao Dong
60e00959b1
[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 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: Ie79f07c5b2160ba32456abc696d0a80a99a09c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:42:04 -08:00
Hao Dong
ab3c46447c
[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 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: Ia93674960ddd3863f7f95480610e28344d80e307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:42:00 -08:00
Hao Dong
fd697a8b25
[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 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: Icd1d3c8b1c2851029c6ab6c162607c3ca5094f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:41:00 -08:00
Hao Dong
5610a1295e
[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 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: I6ff125ed1eaf9acd9e3b396ee9a50be4fcd91a57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:40:53 -08:00
Hao Dong
1017ec16c0
[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 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: Id4db3bd172b7a97de8349092909135ed301f84bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:39:32 -08:00
Hao Dong
a6b7b2ac39
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca
-s ours am: 19c298d5a9
-s ours am: 9cce9a26c7
-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: I354f3ee7f14204925feadede8344e56451defa5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:39:29 -08:00
Hao Dong
c62982e22d
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
am: 2688ddf907
-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: I20dcc3ae5ad2cbdebf068f40a5f04b17f65377ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:38:26 -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