Commit Graph

84118 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
Treehugger Robot
f5876a1df9 Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I818ae58baa161689a867cea8bc4662db602dfdcb
2021-07-30 02:35:23 +00:00
Treehugger Robot
060bf953e3 Merge "Fix memory leak in TopLevelBatteryPreferenceController" 2021-07-30 02:18:11 +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
TreeHugger Robot
14073ffdbb Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706

Change-Id: I0bc2e0daa4d6b8a5f404d853bf92999e42ef4a9b
2021-07-29 15:20:30 +00:00
TreeHugger Robot
68d15388f4 Merge "Update the "Location services" header to be sentence case" into sc-dev 2021-07-29 15:06:45 +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
TreeHugger Robot
8f4ab88d14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b515d34c40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iccff1e583d8c6bf13a281c56d2e600319331bfed
2021-07-28 23:51:16 +00:00
Bill Yi
b13a1025fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c818c3b4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I871599dec295a595cb19ef0441bca6579d96bd73
2021-07-28 23:50:46 +00:00
TreeHugger Robot
b515d34c40 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-28 23:37:43 +00:00
Bill Yi
8c818c3b4a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id06c20035f64636a8b7799fbb847fdf852b70e4b
2021-07-28 15:13:59 -07:00
Bill Yi
b23c15307c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieede676484ceb3dbefc8c6aaf0b90a1043fe6ed1
2021-07-28 15:10:23 -07:00
Yu-Han Yang
1043fd1cf5 Update the "Location services" header to be sentence case
Bug: 191300716
Test: string update only
Change-Id: Ib1194847b9d2b817fa1b8581dc62cd2c1d85da26
2021-07-28 13:01:18 -07: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
7e9077fd14 Merge "Use RestrictedPreference for all biometric settings." into sc-dev 2021-07-27 17:25:25 +00:00
Bill Yi
596a6d3342 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2 -s ours am: 1c95bda96f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id80649a7462ea17ef32755cbad4986cbdce91eb9
2021-07-27 07:08:43 +00:00
Bill Yi
1c95bda96f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6623f4d49330b78682638bb8f825959a4d3c6a8b
2021-07-27 06:59:05 +00:00
Bill Yi
0b297383f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4 -s ours am: 12f186ff22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f1be110fcb3b95b00595d2945359491fbbeb2a8
2021-07-27 06:39:55 +00:00
Bill Yi
12f186ff22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e9b9d78e302e5b5974476cba9a88407f7bcb73e
2021-07-27 06:36:44 +00:00
Bill Yi
fed025e2e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12b1ae00b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41a0fcfdd6c0b4da9a0e32e03bcd44201d65508a
2021-07-27 06:35:07 +00:00
Bill Yi
12b1ae00b8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0d8bd7744e7bcc261f6745c70584860391e423f2
2021-07-27 03:39:15 +00:00
Bill Yi
507d6814a4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifbfc76908c45f5db6d7eff811d31a3eee810231f
2021-07-27 03:26:34 +00:00
Bill Yi
187263e4a2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idc5958063a2353ecaf65a34be2c76d0c4ca8f8f5
2021-07-27 03:12:55 +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
d3d3161695 Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev 2021-07-24 06:32:37 +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
TreeHugger Robot
dfd6de3b5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48 -s ours am: 2308651946 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I557a0eb3ffbd9a266d5457c33b0e888c7a27bf69
2021-07-24 02:38:57 +00:00
Bill Yi
a29cd257d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27 -s ours am: 9de075b836 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib449ed3fcdb414329d867c9580407a7c19e0c6d2
2021-07-24 02:38:53 +00:00
TreeHugger Robot
a0bb0ff019 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1 -s ours am: e34a6626b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48c4bd7985c0082e70c9d9c107cc9ce3c03f1a88
2021-07-24 02:38:43 +00:00
Bill Yi
7da3c35dbc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6 -s ours am: 4fa6d75375 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc4541f20f9c555b81b88b14d9b6f8322838bf02
2021-07-24 02:38:25 +00:00
TreeHugger Robot
2308651946 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e8dcd75f5d6131f42de5a5146b42a6fe943c4cc
2021-07-24 02:33:32 +00:00
Bill Yi
9de075b836 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I64d1291ce7b0b692ae03a7e2089224de4f0b4268
2021-07-24 02:32:55 +00:00
TreeHugger Robot
e34a6626b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d8d1b53b5e7fad1e7d75f3c3be612932147feaa
2021-07-24 02:26:29 +00:00
Bill Yi
4fa6d75375 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25a4f07d88a0a992468a3455853e3fc93b088958
2021-07-24 02:26:22 +00:00
TreeHugger Robot
fea4293f48 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-24 02:23:43 +00:00