Commit Graph

124492 Commits

Author SHA1 Message Date
Matías Hernández
c520da8486 [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: Ia8c943358bb53d7645c9743d98916e6a7dbc9408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 04:46:00 -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
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
a434120410 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: Ieb627204dbc2bfb48e665c7c5850bb30b591bac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:25: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
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
5ef3e25948 [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: I0354cdc556691a539bc530284517a660489918da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:19:06 -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
5ccbef81b8 [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: I2cd5429035be307341db245ad64dde312ebc693b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:32 -08:00
Treehugger Robot
e5a837a9d8 [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: I2970c99575de748f8ee3bc8b7f6807fd321af11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:23 -08:00
Fan Wu
82d37340b5 [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: I7fd0cb6aeeaceafb9736eed5c1348c27f7ebbbd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:20 -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
d95916adb5 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: I589e0940eba59d1696d4b3d0ec32b0ff19ac447f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:09 -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
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
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
b910ad3a9e [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 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: I658b24ec0090754d34095ec3885454a3a84d96f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:49:06 -08:00
Mill Chen
7d6f1c2860 [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 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: I0ab1a8d6bf8f64cf4f04c332a01631056417d3d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:49:00 -08:00
Treehugger Robot
43c256af23 [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 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: I6c79e3a5510e467494e3c43cf81dc4f33a9f489c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:48:10 -08:00
Mill Chen
04fb1f0fbf [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 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: Ia9532a6a6c8fb19a958d9d7439719a3a22ccf466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:48:06 -08:00
Treehugger Robot
9cf7e51e14 [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 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: I31cc1e2130908c02837f0b1805832de55fda4306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:47:52 -08:00
Mill Chen
50c170c738 [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 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: I0390985769bac5eb8af212aaf2d32fd07963bff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:47:45 -08:00
Treehugger Robot
ff8cf6847f [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 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: Ia852bb4e268bfee8a3ac5524887ba514fa6d72fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:46:51 -08:00
Hao Dong
3ba7db7e1d [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 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: I8830090c8ed40506d612d398502e198c32ef16ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:30:32 -08:00
Hao Dong
523a01eebd [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 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: I4573f86c8d79319ee65410fe36a18961925ad2a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:30:26 -08:00
Treehugger Robot
df4d22f184 [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 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: I148fd7a1a5ed2538a0c317e9bef1aefdebdd2552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:29:26 -08:00
Mill Chen
3c1918c941 [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 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: I75ab09ca77c14e96171886ee7b08ad401ce38e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:29:20 -08:00
Hao Dong
64aaef3398 [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 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: Idbcb31116c865d6d7ecd7e6d84c1c9779c6494fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:29:00 -08:00
Treehugger Robot
768999cad4 [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 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: I0f3ea14343d96ec7a7cc2934301280612dc70aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:28:57 -08:00
Hao Dong
a23221108f [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 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: I3f4e7fe34bf0578be88996d67f161a710448202b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:28:57 -08:00
Mill Chen
0a93ced740 [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 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: I92b9e8f76003b293ac25263505a9e768c9ad1b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:28:51 -08:00
Treehugger Robot
8b97d6b8a5 [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 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: I31421e3e2f123c3bdb2b0a09871d06e79b75f718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:28:21 -08:00
Mill Chen
7444cfa7dd [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 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: I850366ef6ee4e40bec5d388d9a19f18ce12f6aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:28:11 -08:00
Hao Dong
6d61f05f14 [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 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: I797c4957afe96d675712f828d258d1ade273cc73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:27:33 -08:00
Hao Dong
1257b21e99 [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 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: Ib58a62698e1e4ba64a0deab793348f72d46f8a13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:27:30 -08:00
Hao Dong
6680b3cb90 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 2688ddf907 -s ours am: c62982e22d -s ours am: 744e8a83f6 -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: Iff46f2acd9a26394c86f8caee1fa826cde859b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:27:04 -08:00
Treehugger Robot
0eb554fb17 [automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136 am: 6608cb542f -s ours am: d601d2ef19 -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: Ib8af57431535c3c65299704a1875c3d2c526dcca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:21:41 -08:00
Hao Dong
e71bb309ce [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 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: I7f31fdc3be63717485dc0e8832cf2b49dc60ed3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:11:44 -08:00
Hao Dong
9608d3384c [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 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: I2c3c84e7ece36da84240419c8b4e04921ff940db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:11:34 -08:00
Hao Dong
1f4dbc2c07 [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 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: Iee7f42e994cb891d11e87a374acd8c3e66dedd37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:09:53 -08:00
Hao Dong
ddc286e72c [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 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: I1d05d31fa59e328120f419fabbd0595bb80c1dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:09:45 -08:00
Hao Dong
b7c547504a [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 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: I29859fc7393f21fda7196154f138c77780ba1b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:07:56 -08:00
Hao Dong
d33c418fed [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 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: I6ae06245acbe0adcc7d202d397bd57c4b47b3e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:07:47 -08:00
Hao Dong
744e8a83f6 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 2688ddf907 -s ours am: c62982e22d -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: I1e7cfa4e05739f974a40e1a8043aab9f033c5589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 12:06:35 -08:00