Commit Graph

37823 Commits

Author SHA1 Message Date
Treehugger Robot
9cfd6a6164 Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I9966577fec0160fb4c13cde9cfcf7bf8d7b5697d
2021-07-30 02:45:06 +00:00
Joe Bolinger
21ef1830ea Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152

Change-Id: I4c5dd9f9a73e7bc83d8e5c0ccf90358f8bdc8383
2021-07-30 01:35:07 +00:00
Joe Bolinger
12e161d1dc Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev 2021-07-30 01:21:55 +00:00
Joe Bolinger
91d7545826 Limit biometric enrollments when Unicorn account is present.
This prevents biometric enrollment from happening after consent
has been obtained and is being managed by family link.

Note that this requires a corresponding change the setup wizard app
to work in most cases.

Bug: 193577587
Test: manual (enroll then relaunch SuW and repeat)
Change-Id: If260e49f38a141931d7f3362c1faf80ee7790232
2021-07-29 15:43:04 -07:00
Evan Severson
1ea7d23088 Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614

Change-Id: I23b162a2acae20a9621e84ba3953c12ebbe57e41
2021-07-29 20:00:10 +00:00
Evan Severson
405fac1ca0 Merge "Set toggle state for profile group" into sc-dev 2021-07-29 19:45:59 +00:00
Anita Hemrajani
6187ec83a8 Fix memory leak in TopLevelBatteryPreferenceController
Assigning context.getApplicationContext() as context in
ConditionContextualCardController.

Bug: 181192885
Test: run connectivity module auo test pass

Change-Id: Iff35520f911a9fd62a0bbb5bbda20608e9d99246
2021-07-29 15:30:28 +08:00
SongFerngWang
9d9d06ab24 Fix the wrong comparison am: 1bcba3d23f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429

Change-Id: If39ce68a76790912d69dfce084bbf8b9421f8ec0
2021-07-28 17:03:56 +00:00
SongFerngWang
1bcba3d23f Fix the wrong comparison
Bug: 173387374
Test: atest NetworkSelectSettingsTest (PASS)
test on real device (PASS)

Change-Id: Ib1135b0457b4e35db67e671cad142657457d6d75
2021-07-28 14:15:31 +00:00
Zoey Chen
046c8d4a97 Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352

Change-Id: I6e15a328c230cae09f8a980cf86cb9f09a577655
2021-07-28 03:40:11 +00:00
Zoey Chen
1a6982f195 Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev 2021-07-28 03:21:12 +00:00
Zoey Chen
9894f347f2 [BackupCall] The toggle doesn't work when try to disable/enable it.
Bug: 192060713
Test: atest NetworkProviderBackupCallingGroupTest
Change-Id: I250c321d682f77e95967824ec033dd3c1ea64b65
2021-07-28 09:11:05 +08:00
Joe Bolinger
1841f0f132 Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293

Change-Id: I2c400fb7daffee7abf6e1df4a3636e593b13586e
2021-07-27 17:41:42 +00:00
Joe Bolinger
61d998406d Use RestrictedPreference for all biometric settings.
Fix hardcoded preference key in settings controller.

Fix: 194708564
Bug: 194246380
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I86bdd40fd848c5ba2d39acfde4771f5969e640d1
2021-07-26 18:36:32 -07:00
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
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
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
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
SongFerng Wang
9e6928ae2e Merge "aggregate the items of network selection list" into sc-dev 2021-07-23 09:04:58 +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
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
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
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
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
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
Stanley Wang
8172520329 Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc143
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270337

Change-Id: I32a8dde99dbe338554f3ba9984569886174a290e
2021-07-19 02:30:21 +00:00
Stanley Wang
2ea54cc143 Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev 2021-07-19 02:10:21 +00:00
Curtis Belmonte
8d443bdebd Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I73dd8540c975cdb535a5c0f008d98ecfcf4b23ac
2021-07-17 00:51:02 +00:00
Curtis Belmonte
a18a8a1ad0 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev 2021-07-17 00:47:14 +00:00
Curtis Belmonte
c6ced3fb21 Fail fingerprint enroll with error if HAT is null
Fingerprint enroll expects a non-null HAT. If we don't have one, rather
than crashing or stalling out enrollment, fail fast with an error.

Test: Manual

Bug: 193811614
Change-Id: Ifb791e19430e33cb82566e4916ab1a7b997b32ff
2021-07-16 14:35:25 -07:00
Stanley Wang
1fcdafbcda Fix the problem that the SIM status and IMEI after the "Build number".
- Adding the SIM status and IMEI items of SIM2 to the PreferenceScreen
  can not put these items in the correct categories. We have to put
  these items directly into the correct categories.

Fix: 193384705
Test: robotest and see the UI

Merged-In: I2de7ee72fc1315eeef01288b386f8756ca366e33
Change-Id: I9472ecd604afe2f2e2eaf08c92ec11e439e8fc1d
2021-07-16 22:03:54 +08:00
Stanley Wang
69a9d7aa11 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: I287a6788e9ff460ab58a1c61e019be0cf37480a6
2021-07-16 11:54:13 +00:00
Stanley Wang
c916876cc7 Merge "Update the illustrations of System navigation page." into sc-dev 2021-07-16 11:37:51 +00:00