Commit Graph

38152 Commits

Author SHA1 Message Date
Peter Kalauskas
3f3c7b7762 Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999

Change-Id: I6084b5f8ec7e7a07afede1594d3a302974165c74
2021-07-26 15:07:10 +00:00
Peter Kalauskas
c9076d3d36 Merge "Fix: change owner name when account setup" into sc-dev 2021-07-26 14:52:29 +00:00
TreeHugger Robot
923b048d73 Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270 am: 7993875a8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629

Change-Id: Iedd478cd368b79d2bc1c409da28cbf20ca9bafc7
2021-07-24 19:11:53 +00:00
TreeHugger Robot
7993875a8e Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629

Change-Id: I29147e9d2400dbdccde9c63f15deb79240a2dd66
2021-07-24 19:00:27 +00:00
TreeHugger Robot
7364b38193 Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629

Change-Id: I3979eea6816ff8f6cf37f698b6015f87b4b0d4e9
2021-07-24 18:58:49 +00:00
TreeHugger Robot
ae23247270 Merge "Use correct user ID for face bypass pref controller" into sc-dev 2021-07-24 18:46:18 +00:00
Curtis Belmonte
43f2be2059 Use correct user ID for face bypass pref controller
Ensures that the lockscreen bypass preference toggle shown on the face
unlock settings screen always uses the correct user ID. This fixes an
issue where the preference toggle for a guest user would use the
primary user's setting when multiple biometrics are supported.

Test: Manual:
1. Turn on Settings > System > Multiple users > Use multiple users
2. Add a guest account and switch to it
3. Enroll a face for Face Unlock on the guest account
4. From the Face Unlock settings screen, toggle "Skip lock screen"
5. Ensure that face bypasses lock screen iff this toggle is on
6. Switch back to the owner account and repeat steps 3-5

Fixes: 193488905
Change-Id: I2da4ce466fe0446cccc9119c90bd322daf627339
2021-07-24 09:20:08 -07:00
Tom Hsu
b114cda66f Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695 am: 10af4a87fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364

Change-Id: If1f5f714eee5f7461033c94ffc7b3c5d3abb42a8
2021-07-24 06:54:47 +00:00
Tom Hsu
50cacb7ef4 Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364

Change-Id: I96fa216a724ac84aeb9f8eba05c1d709fc9e701d
2021-07-24 06:42:40 +00:00
Tom Hsu
10af4a87fb Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364

Change-Id: Ie33f9ae9cb7dfe13562b67010a8b56cf8941a288
2021-07-24 06:41:01 +00:00
tom hsu
01f43ff290 [Settings] Fix problem that MobileNetworkActivity show wrong Info.
- UiccSlotInfo only provide current active slots. It doesn't provide
 inactive slot. Thus,it should not use it for checking sim existed.

Bug: 194022251
Bug: 194378040
Test: Maunal test
Change-Id: I00a3fcf3f700bee804bad12039d6d13a1404cc74
2021-07-24 05:34:07 +00:00
Adam Bookatz
7ae8801fba Fix: change owner name when account setup
When the device is setup with an account the
owner's user name should be updated. This was broken due to
ag/14056085, so we fix it here.

Test: manual (set up new device and make sure name is changed)
Bug: 194510551
Change-Id: Ide5bc525eba17c78f457c2baa131d7cefd4c15dd
2021-07-23 23:50:54 +00:00
Evan Severson
7d1835a319 Set toggle state for profile group
The toggle state should be set for all users in the current profile
group; for example a profile user.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=SensorToggleControllerTest
Fixes: 194280328
Change-Id: Ib0b74e7b27722b44b116e614dc960bff72983a38
2021-07-23 16:04:39 +00:00
SongFerng Wang
bba3f60330 Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e am: eb2525603f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15340173

Change-Id: Ia7e09b8bcad3906c810e7151e7a1fed750aed14e
2021-07-23 09:36:39 +00:00
SongFerng Wang
eb2525603f Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15340173

Change-Id: If603e6d8ef89e7be6b88321c9680272f5f5704a6
2021-07-23 09:20:12 +00:00
SongFerng Wang
9b1493a789 Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15340173

Change-Id: I4769f0bcb21bf6b56f8dad38f535472b85437ebe
2021-07-23 09:18:40 +00:00
ykhung
54f5fef04a Remove some debugging log to avoid print too much data out am: 13bcdba67a am: f12c64624b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15360451

Change-Id: I0e5d3f6a8b3b98b7b528f72a0bf6b4d552d9f887
2021-07-23 09:08:34 +00:00
SongFerng Wang
9e6928ae2e Merge "aggregate the items of network selection list" into sc-dev 2021-07-23 09:04:58 +00:00
ykhung
f12c64624b Remove some debugging log to avoid print too much data out am: 13bcdba67a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15360451

Change-Id: I2200d1ac826e3d53435fc67d283084057e681bd8
2021-07-23 08:52:13 +00:00
ykhung
4b5be3b73a Remove some debugging log to avoid print too much data out am: 13bcdba67a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15360451

Change-Id: I0c8e6985c083dd8e9c9958efb796eb0abaf09a4e
2021-07-23 08:50:56 +00:00
SongFerngWang
7f5c984655 aggregate the items of network selection list
According to bug comment#44, modem only report one PLMN per RAT
for different cells reported for the same PLMN/RAT combination,
UI affregate those items.
Bug: 173387374
Test: atest NetworkSelectSettingsTest

Change-Id: I155abc8dda7c8ec42cf4fd677bd2aa99d1033ad1
Merged-In: I8e05b9f6784bad7f0de4e79cc6e707749745f0c1
2021-07-23 07:27:30 +00:00
ykhung
13bcdba67a Remove some debugging log to avoid print too much data out
Fixes: 194251993
Fixes: 194021631
Test: make SettingsRoboTests
Change-Id: Ibd1c7ce9d664820b2975039582a1ea5fb18b0be1
2021-07-23 02:52:14 +00:00
TreeHugger Robot
73aa50eca6 Merge "Update accesibility button to suuport accessibility gesutre" into sc-v2-dev am: bd41311025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085892

Change-Id: I2885e26d6ee4f7e323bf4eccd4f3fa27b608ac70
2021-07-22 19:12:07 +00:00
TreeHugger Robot
4978a2ed2f Merge "Add back the shortcut dialog content for accessibility gesture" into sc-v2-dev am: b1bdec314a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085455

Change-Id: If9e22c7fa4381b0e0f96e193482f65ff6391fb73
2021-07-22 19:12:05 +00:00
TreeHugger Robot
764683ad00 Merge "Add back the accessibility gesture tutorial dialog in system navigation" into sc-v2-dev am: 750dc4a067
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083860

Change-Id: I0b1912daf387f7242e3a96db6965cf3bb725216b
2021-07-22 19:12:03 +00:00
TreeHugger Robot
bd41311025 Merge "Update accesibility button to suuport accessibility gesutre" into sc-v2-dev 2021-07-22 18:54:00 +00:00
TreeHugger Robot
b1bdec314a Merge "Add back the shortcut dialog content for accessibility gesture" into sc-v2-dev 2021-07-22 18:54:00 +00:00
TreeHugger Robot
750dc4a067 Merge "Add back the accessibility gesture tutorial dialog in system navigation" into sc-v2-dev 2021-07-22 18:54:00 +00:00
YUKAI HUNG
9bb7d79438 Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-dev am: 9d2048ab5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15343065

Change-Id: Iaa89d42b141defa3e3fb1ab8d5b03260d55fe2af
2021-07-21 13:20:11 +00:00
YUKAI HUNG
9d2048ab5b Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-dev 2021-07-21 13:06:50 +00:00
YUKAI HUNG
0520694736 Merge "Enhance battery usage refresh content log for performance testing" into sc-dev am: a1b5fbc89c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15343067

Change-Id: I3c316a639b4029e49947be132d640aec46d8b605
2021-07-21 11:14:36 +00:00
ykhung
512fcfc73b Enhance battery usage refresh content log for performance testing
Fixes: 194021631
Test: make SettingsRoboTests
Change-Id: If013befb7a9aaf590762cec10035269e66588ab7
(cherry picked from commit 8c4f097592)
2021-07-21 09:41:19 +00:00
ykhung
26af50c21e Include new "dex2oat64" process to map into App Optimization name
Bug: 191991503
Test: make SettingsRoboTests
Change-Id: Ib392ed3adf7fe37fdaf73076dd1c3cd8361468eb
(cherry picked from commit d76c12f69c)
2021-07-21 09:39:12 +00:00
TreeHugger Robot
188acf6267 Merge "Add logs for tracking Slice provider startup" into sc-dev am: 623d86d121 am: edd603ce9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15334936

Change-Id: Icd41ba07e33954c3791e9562bc02c54627951fe9
2021-07-21 05:16:37 +00:00
TreeHugger Robot
e20cfa4854 Merge "Add logs for tracking Slice provider startup" into sc-dev am: 623d86d121
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15334936

Change-Id: I404d161723ddf9b2476ea9790fe2d364c76553aa
2021-07-21 05:07:56 +00:00
TreeHugger Robot
edd603ce9b Merge "Add logs for tracking Slice provider startup" into sc-dev am: 623d86d121
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15334936

Change-Id: I6ede3c1673a156b50af9c9d2644448ae22c711ba
2021-07-21 05:06:49 +00:00
TreeHugger Robot
623d86d121 Merge "Add logs for tracking Slice provider startup" into sc-dev 2021-07-21 04:52:23 +00:00
Jason Chiu
f0248e096e Add logs for tracking Slice provider startup
Bug: 191555397
Test: build, manual
Change-Id: Ic95fb0a7a8ba30f7802111a7a453fb73f4c918fe
2021-07-21 03:48:03 +00:00
Curtis Belmonte
b4cd016706 Move multi-biometric logic to base fp intro activity am: 0a8916a808 am: 7b17b326b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15339693

Change-Id: I0510776afc14d157f3c7f3a07a49afdaedc26768
2021-07-21 00:50:46 +00:00
Curtis Belmonte
7b17b326b0 Move multi-biometric logic to base fp intro activity am: 0a8916a808
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15339693

Change-Id: Ieb42859423c25a0467cf83a1dbcb3f3a3db2e660
2021-07-21 00:36:14 +00:00
Curtis Belmonte
848c5817dc Move multi-biometric logic to base fp intro activity am: 0a8916a808
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15339693

Change-Id: I5ff75c167d643bea4758c05a919e629cf3766ab7
2021-07-21 00:35:13 +00:00
Curtis Belmonte
0a8916a808 Move multi-biometric logic to base fp intro activity
Ensures that the relevant multi-biometric logic--specifically, logic to
ensure that fingerprint enroll is shown exactly once after face
enroll--is present in both the SUW and non-SUW versions of the
fingerprint enroll introduction activity. This fixes an issue where
fingerprint enroll would occur multiple times when triggering the
multi-biometric enroll flow outside of SUW (e.g. via an enroll intent
action).

Test: CTS-Verifier: Biometric Tests > 2a: Strong Biometrics + Crypto

Bug: 193601823
Change-Id: I17c09e9a72ced2f23b0b279ea51a6aa209668485
2021-07-20 13:32:13 -07:00
Curtis Belmonte
91ab34f189 Merge "Ensure fingerprint setup is shown once after face" into sc-dev am: 6850b70226 am: 73e12ba36e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305975

Change-Id: I19126a96386bd3fbbe37c80ef37b8542f45f6c41
2021-07-19 20:05:04 +00:00
Curtis Belmonte
73e12ba36e Merge "Ensure fingerprint setup is shown once after face" into sc-dev am: 6850b70226
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305975

Change-Id: Id994e83b6361d16faf3e3761fb845a18bca886e3
2021-07-19 19:55:57 +00:00
Curtis Belmonte
6e416b92dc Merge "Ensure fingerprint setup is shown once after face" into sc-dev am: 6850b70226
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305975

Change-Id: Idd9cc4759d3083d4c060fd65d10ea4ceb154c199
2021-07-19 19:55:12 +00:00
Curtis Belmonte
6850b70226 Merge "Ensure fingerprint setup is shown once after face" into sc-dev 2021-07-19 19:44:40 +00:00
Edgar Wang
8f552fcf64 Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef am: 0eb13d6df8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335

Change-Id: I4e18bd5223a249eeda86834e7c1d3216ca567a3b
2021-07-19 13:26:59 +00:00
Edgar Wang
0eb13d6df8 Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335

Change-Id: Ibbc0b965e9b0676cefc78570f5ec46c6bbc30330
2021-07-19 13:12:40 +00:00
Edgar Wang
eff77ffd0d Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335

Change-Id: Ie95f0de5bd7ed35c1e3494e0823dd99a00032c9b
2021-07-19 13:11:44 +00:00
Edgar Wang
6e972e81ef Merge "Find the double twist sensor using the type instead of the name" into sc-dev 2021-07-19 12:58:43 +00:00