Commit Graph

133377 Commits

Author SHA1 Message Date
Automerger Merge Worker
aaa7df3839 Merge changes from topic "am-f5e745cc763042748e9770118de4792b" into main
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours am: c86183ec60 -s ours am: c7052d15af -s ours am: d58a47c4d0 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours am: 2f8d8d1d79 -s ours am: 3759d6c76e -s ours am: bb149b50b8 -s ours
2023-08-08 03:58:07 +00:00
Eric Biggers
3e7a2456ff [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours am: c86183ec60 -s ours am: c7052d15af -s ours am: d58a47c4d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f57fce5f6b6b947421c89479a15890a9fb928fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:56:57 +00:00
Eric Biggers
903a477e68 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours am: 2f8d8d1d79 -s ours am: 3759d6c76e -s ours am: bb149b50b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7c4f8304ec1ac2ef01ae692b229deabf26098bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:56:52 +00:00
Eric Biggers
faf226f3c0 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours am: 1abf58870f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83356501481188693ae36d86f9d72fa2279f1a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:56:16 +00:00
Eric Biggers
8265dcfd0d [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: bf33df4d79 -s ours am: 92470de980 -s ours am: 914f7b3a71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I460889e85866000d860d2ddbf54cb2a192622fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:53:36 +00:00
Eric Biggers
94e49baa18 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 011f39e944 -s ours am: f509f69b79 -s ours am: e0ea733bba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I418b95ca848c235e8eda7dfd718211049d6fa28b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:50:06 +00:00
Eric Biggers
d58a47c4d0 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours am: c86183ec60 -s ours am: c7052d15af -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic163102bedd7124c842286e9abeb8111305e33a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:26:32 +00:00
Eric Biggers
bb149b50b8 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours am: 2f8d8d1d79 -s ours am: 3759d6c76e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43eddfec816ad81e30a9d92fb843ae99fa2766ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:26:29 +00:00
Eric Biggers
1abf58870f [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I729498d04bd5fa418003ac67e8f076aa1f74652a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:08:54 +00:00
Eric Biggers
914f7b3a71 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: bf33df4d79 -s ours am: 92470de980 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1a01fb9a2e022bbcfa935a668a6f9e3a28fa23a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:07:45 +00:00
Eric Biggers
e0ea733bba [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 011f39e944 -s ours am: f509f69b79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8013db9e933b98b8693db5a00469342bb35999d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:06:02 +00:00
Eric Biggers
2e0b1e4abb [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours am: ba7dfd53b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8662df4a3e3d8f13bf65a80f0a13a7682c9219e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:44:23 +00:00
Eric Biggers
6cfab4ad79 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours am: 7e5d519cf4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie88eb8a5fcedc49116d87080c6af3884c2bd8e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:44:18 +00:00
Eric Biggers
c7052d15af [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours am: c86183ec60 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4be644c6ea1180cd3b4d566986e24af2b8ce7f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:43:39 +00:00
Eric Biggers
3759d6c76e [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours am: 2f8d8d1d79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia27d17e598d6284c312e9cdfe52d6a7e3f389a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:43:36 +00:00
Treehugger Robot
cee9631614 Merge "Refersh saved Wi-Fi networks" into main 2023-08-08 02:29:39 +00:00
Eric Biggers
f20abd9355 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3be3a5c8c1634a8c9c3cd2f3fb3d119dec9c1ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:27:02 +00:00
Eric Biggers
92470de980 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: bf33df4d79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20fae5de7473a5b2ba5f5282665edeace6c8a6c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:25:51 +00:00
Eric Biggers
f509f69b79 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 011f39e944 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If649c72c39881c59dbd1a7597447d7430edb8961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:23:10 +00:00
Eric Biggers
230898d099 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev am: 00885a8cb5 am: f41767c07a -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 05f1eff1c9 is already in history

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

Change-Id: I54e506717e6bb7dfb75cc4422c2ce0d32a73aa5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:08:17 +00:00
Eric Biggers
c601e9eb07 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50f93771bc am: 62fa3772ed -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 05f1eff1c9 is already in history

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

Change-Id: I4a8fa12dcf54058c70a95361523ffe1661bc905f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 02:08:14 +00:00
Eric Biggers
ba7dfd53b8 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If65b4e9e0d640a4f9dc1b540b840a9435aed166a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:59:13 +00:00
Eric Biggers
7e5d519cf4 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I180e9f3771dd5f9e32876c2ac6568d8a4eaf50dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:59:10 +00:00
Eric Biggers
c86183ec60 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6fb8b7198d1f4199b64cb0540091208847704aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:55:35 +00:00
Eric Biggers
2f8d8d1d79 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8220391370f5485505e0990ed9d71b513a21c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:55:29 +00:00
Eric Biggers
06c2588645 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b558e9a8b46f465fa87be7d5232239bb7eec3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:38:41 +00:00
Eric Biggers
bf33df4d79 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I05baeebef5abb0d46da580535914772270bb6325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:37:27 +00:00
Eric Biggers
011f39e944 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337

Change-Id: I8607f271c5daf117b25502b572598e48dc2de30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:35:06 +00:00
Eric Biggers
7bed9704c9 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f6f74c706a397cfbad6685c152c015906a63b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:31:46 +00:00
Eric Biggers
8360c2e940 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41c8afe636e06554df78cc253b93e6dfea887f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:31:36 +00:00
Eric Biggers
f41767c07a Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev am: 00885a8cb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24297965

Change-Id: Ifd772c48ea27b360826e4e87433edec520c89b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:16:29 +00:00
Eric Biggers
62fa3772ed RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50f93771bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24297965

Change-Id: I527deaf07af54d6aba582898d29c06c957eff994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:16:23 +00:00
Eric Biggers
2ce24a1fa9 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I35f68ccc8b118df5340a679e9a8c128055486ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:15:38 +00:00
Eric Biggers
81bd8912af [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icfbce08c030aac4ac4532bf4535970c2a97f22f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:14:44 +00:00
Eric Biggers
7475b96786 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I72421fe89e4b0ed32f193384805bc502e0f24f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:11:34 +00:00
Eric Biggers
94ffd66957 Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev 2023-08-08 00:51:38 +00:00
Eric Biggers
00885a8cb5 Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev 2023-08-08 00:50:18 +00:00
Wenhui Yang
ed505c25fa Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev am: c2b7914778 am: b41875eff3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211335

Change-Id: I413b6692409ca97f48f6c68ad99b894d12e4734a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 20:33:36 +00:00
Wenhui Yang
b41875eff3 Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev am: c2b7914778
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211335

Change-Id: Ie562c88a61db12214c11ee18361781f439abb12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 20:13:10 +00:00
Wenhui Yang
c2b7914778 Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev 2023-08-07 19:55:44 +00:00
Matt Casey
2710d5a85f Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am: 39715d3023 am: 3362abc551
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24265323

Change-Id: I95a7256b5488b7847ebd348c455162fa08a2c3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 19:47:09 +00:00
Matt Casey
3362abc551 Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am: 39715d3023
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24265323

Change-Id: I44f59ffc7c97affb13fda2151f950a3844a72d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 18:48:10 +00:00
Matt Casey
39715d3023 Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev 2023-08-07 17:56:15 +00:00
Weng Su
1962145282 Refersh saved Wi-Fi networks
- Refresh existing saved networks with the same key of WifiEntry

- Update Wi-Fi icon when connection status changes

Bug: 290644817
Bug: 291032267
Bug: 293468313
Bug: 294866208
Test: Manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test

Change-Id: Ifadfb7c46edf8eda32e4ff5dcb6bb3ff086447c8
2023-08-07 17:49:04 +00:00
Treehugger Robot
317bfca133 Merge "[BiometricsV2] Refactor EnrollIntroViewModel" into main 2023-08-07 05:22:36 +00:00
Treehugger Robot
538eafcbf2 Merge "[BiometricsV2] Refactor AutoCredentialViewModel" into main 2023-08-07 05:22:13 +00:00
Treehugger Robot
49d3feaa74 Merge "[BiometricsV2] Fix skip action for udfps enrolling" into main 2023-08-07 05:19:08 +00:00
Chaohui Wang
79a978989f Revert^2 "Clean up unused WifiManager.ActionListener"
This reverts commit c4a0abef8c.

Reason for revert: The original is not the root cause.
Root cause is b/294378814

Change-Id: Ib44ad912073b0f1b06c7ef6b6b998581eef65784
2023-08-07 04:22:56 +00:00
Treehugger Robot
c001665f00 Merge "Clean up unused operator_warning" into main 2023-08-07 03:56:14 +00:00
Chaohui Wang
ab88423f55 Merge "Remove PreferenceXmlParserUtils deprecated methods" into main 2023-08-07 03:13:42 +00:00