Bill Yi
e48fa8c19f
Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE"
2023-05-04 22:39:57 +00:00
Becca Hughes
3096997718
Use isPrimary bit to determine top provider
...
If the cred man provider has the isPrimary
bit set then we should use it as top
provider.
Test: ondevice
Bug: 280454916
Change-Id: I8c5651909d3926f09549c64af68185f1ef633198
2023-05-04 21:19:54 +00:00
Oli Thompson
959976f5df
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
am: a99e532ce8
am: 2330c13289
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I4b504a4d3f788136a6d7a3db54b439eb46db395b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:51:59 +00:00
Oli Thompson
be868c98fe
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
am: 983c8081db
am: 465ff4f2d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I0325bc76920b50bca77085fa7db07d999d581c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:43:52 +00:00
Oli Thompson
465ff4f2d2
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
am: 983c8081db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I051363cf71979cd50d1b3f22032aecdcbd99c72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:05:41 +00:00
Oli Thompson
2330c13289
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
am: a99e532ce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I383dd7bb3c33516ffe70f404ff553289690016fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 20:03:11 +00:00
Oli Thompson
ccb3614559
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
am: a99e532ce8
am: 3c003a0300
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I2a28c3dd6fefc393201734364361b3b21db3bd96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:20:51 +00:00
Guangjie (Jerry) Shi
09aa395cd3
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: f3e24a0595
am: 6e2724c62d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: I9d38cf6628d9f2f9868de5cfa11183cd4ef6c128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:20:18 +00:00
Guangjie (Jerry) Shi
f35c0a1254
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: 38a3645ad1
am: 01e1a4c0fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: Ie09f47ba70f8dbeb99387c3acd57a60596314d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:17:17 +00:00
Xiaozhen Lin
7140c2bcb0
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: cf18fba86c
am: 1e3a085121
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: Ib95d046a197932718e3ea14bfc89e9c09e77357a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:15:58 +00:00
Xiaozhen Lin
2a8345d82a
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: b0df220382
am: 8a16522a44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I7cadb738e7930639909c15208fc6b90581be531d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:14:46 +00:00
Oli Thompson
3c003a0300
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
am: a99e532ce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: If9125a6c97bfb3520e2ee31f68e178c604f29f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 19:14:11 +00:00
Oli Thompson
a99e532ce8
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I7af3a61b06c9922be100dbba9a2bd0b58ba784d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:57:31 +00:00
Guangjie (Jerry) Shi
6e2724c62d
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: f3e24a0595
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: Iad77b961d8b9352e14732a9bfb0311e23dac7348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:54:02 +00:00
Oli Thompson
983c8081db
Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558
Change-Id: I75481f3d79891dba6f6fd5b1355433e288dac3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:53:30 +00:00
Guangjie (Jerry) Shi
5fb7bdb79b
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: f3e24a0595
am: 22776f3097
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: Ifcbe53717c43cfc198edf5731806f47b850cc396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:39:45 +00:00
Guangjie (Jerry) Shi
01e1a4c0fd
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: 38a3645ad1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: I8ad61423e61cd583fb9698c469935a6618ab83d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:39:36 +00:00
Xiaozhen Lin
4a7a20e3e0
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: b0df220382
am: 78c986c89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I4a1441b61ad958fa9580e8ff7f18c011569ec188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:39:36 +00:00
Xiaozhen Lin
1e3a085121
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: cf18fba86c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: Ia1c9dfaa13adb5a97f2e6a562e99134c4ca3bb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:38:49 +00:00
Xiaozhen Lin
8a16522a44
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: b0df220382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: Ifb3b9d5ab39f06d954163d46e3ff7c339b385e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:32:21 +00:00
Oli Thompson
69fcc2ba5c
Merge "Change icon in settings work challenge" into udc-dev
2023-05-04 18:28:23 +00:00
Guangjie (Jerry) Shi
22776f3097
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: f3e24a0595
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: I8bbf72d419885144d48d52c2458bf3322a18619b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:15:26 +00:00
Xiaozhen Lin
78c986c89e
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: b0df220382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I9ea6f80037613fffafb396234da83172fc1bbb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:15:19 +00:00
Guangjie (Jerry) Shi
38a3645ad1
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: I3beee0f10d1f007b8df76f3871a01bae7121d013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:55:30 +00:00
Guangjie (Jerry) Shi
f3e24a0595
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: Ie4d4a6cdc9e94ce2143255e7f380ff7492abe825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:54:31 +00:00
Xiaozhen Lin
b0df220382
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I6706bf4e642f5a7dbfdd6ec6f328382644407b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:54:02 +00:00
Xiaozhen Lin
cf18fba86c
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I13fad162f2d5f1b92ee90a079dea99fc68114c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:52:46 +00:00
Guangjie (Jerry) Shi
817ee8489f
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev
2023-05-04 17:33:03 +00:00
Xiaozhen Lin
be911918d0
Merge "Password clearing in Settings App" into udc-dev
2023-05-04 17:09:34 +00:00
Lucas Silva
90763da52b
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 86231b9ec5
am: 100c550fda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: Iccefb7de3a7b543279258248fca8588aeebd1afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:52:35 +00:00
TreeHugger Robot
e907bf4a02
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 1765b7d866
am: 2d3c8e3c37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I5f9bdd53865b465db645ee604b91d6765a8009b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:52:25 +00:00
Lucas Silva
9e3f65948b
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 5cd017f470
am: f1183c161b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: I59f9f71a715bdb477fd7a4e214c6d6fed73fccc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:48:29 +00:00
Lucas Silva
826ec6608b
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 86231b9ec5
am: 69b0fd5d45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: Ic0b600fe9878c90278891d6eb462f0e6db65a7fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:48:02 +00:00
TreeHugger Robot
f3448913d0
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 76edddc1c5
am: 878a4ac1df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I5cd9783fc90757392d7b38c868ec0d4cd8301d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:47:53 +00:00
TreeHugger Robot
98017e25bf
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 1765b7d866
am: 777e3778dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: Ifeb6551c49eca0ef1da5f1e4307f4592f4b79021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:47:39 +00:00
Lucas Silva
100c550fda
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 86231b9ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: Iadceabdd679c5a66b5f46d9a517b839e98b2dc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:10:33 +00:00
Lucas Silva
f1183c161b
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 5cd017f470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: I50f6924f38b0252135ae579d222aa8085a3dc5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:10:25 +00:00
TreeHugger Robot
2d3c8e3c37
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 1765b7d866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I46c9e01f6edfcf325cbbbc10d58735394d99660e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:09:56 +00:00
Lucas Silva
69b0fd5d45
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 86231b9ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: If7e797520ae040dc9439b6c304da6afb9c09ca84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:09:46 +00:00
TreeHugger Robot
878a4ac1df
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 76edddc1c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: Ia5830736de9c3d15256343f579e5e022feaf1d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:09:39 +00:00
Lucas Silva
5cd017f470
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: I067595333640ccba5b76f54a2b529049869192c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:06:07 +00:00
TreeHugger Robot
777e3778dd
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 1765b7d866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I4784eabb88684a4d18bf0bee1947f4178babe973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:05:54 +00:00
Jerry Shi
645ba04085
Modify the usage of setEnabledProvider to temporarily passed in empty
...
list.
Test: local test
Bug: 280492574
Change-Id: Id13aea203636527bcda745727aae417b2a8e289c
2023-05-04 08:57:43 -07:00
Lucas Silva
86231b9ec5
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: I6bef5d5f5c4730c8832436b03242315aa4098f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:48:46 +00:00
Lucas Silva
d66bde103a
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev
2023-05-04 15:37:25 +00:00
TreeHugger Robot
1765b7d866
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I2f1bdfb9c562ecc3809376e1dfa471388cb5451a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:27:32 +00:00
TreeHugger Robot
76edddc1c5
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I97766d9ecac3a7de66d7d1b66a95264c14049a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:23:05 +00:00
TreeHugger Robot
3a2b8e81e5
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev
2023-05-04 14:57:36 +00:00
Chaohui Wang
01722dbe3f
Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1
am: e9540185f1
am: 465a31a677
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670
Change-Id: Ib96c432ee631aa3fa238ac95d23fc4c457e2bc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 11:58:26 +00:00
Chaohui Wang
b9a4e2bf09
Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1
am: e9540185f1
am: eac485f661
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670
Change-Id: Ic29bb216e55d166b0cf8bbe39b282482ed9f9668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 11:35:21 +00:00