Treehugger Robot
bd71ddc59b
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3
am: f5876a1df9
am: 9cfd6a6164
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: I9d3f933e3fa5c68e34e97f9b4191022c5d0aee8b
2021-07-30 03:00:43 +00:00
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
6cab6458d6
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: 21ef1830ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I9980fa2cbaabec648590902df007d21ab1c7f893
2021-07-30 01:50:43 +00:00
Joe Bolinger
24a3796f7c
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: 769447a502
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I264232763f7e0af216291368ae5f704942f12ad7
2021-07-30 01:50:19 +00:00
Joe Bolinger
769447a502
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: If88427e1b7ed4d5227c821ab65e47f52cc9c5481
2021-07-30 01:36:43 +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
14b7870359
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 1ea7d23088
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: Ic9d017314e117b01c6b89d551c35ec6c334ab26e
2021-07-29 20:16:03 +00:00
Evan Severson
e2b8e585b1
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 8a1461a212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: Id015925230ad1cea4063edc0cb197b54bbf2950c
2021-07-29 20:15:42 +00:00
Evan Severson
8a1461a212
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: I02ba1737c89d0f85012586ead62b0835f67d2397
2021-07-29 20:01:45 +00: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
61ef2b16a0
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 14073ffdbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: Ib90d8b40b6f9171d7a17ca4f2dddc72485777859
2021-07-29 15:34:23 +00:00
TreeHugger Robot
09b7117716
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 84286f0ea1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I4642b4900ff44d764cfe7cd3474c7b08524e26fb
2021-07-29 15:33:51 +00:00
TreeHugger Robot
84286f0ea1
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: I25d5844d8dd7d58bcc84779441d8984db3efd07e
2021-07-29 15:21:53 +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
7d631b7a07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b515d34c40
-s ours am: 8f4ab88d14
-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: I0fa72fb70b9df0bda989de5e410abb0a03148f43
2021-07-29 00:09:29 +00:00
Bill Yi
11da8df2b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c818c3b4a
-s ours am: b13a1025fe
-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: Id705e0eabcb22c924e2defe443f65e9c326622ee
2021-07-29 00:08:58 +00: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
bd9f646449
Fix the wrong comparison am: 1bcba3d23f
am: 7f69cca1a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: Ic6fec56ca303d35846a8586496bc340649e3a6a9
2021-07-28 17:20:55 +00:00
SongFerngWang
1d3acafa1f
Fix the wrong comparison am: 1bcba3d23f
am: 9d9d06ab24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: I351acbe3d524aa58535001b5bd5101487625c11a
2021-07-28 17:13:31 +00:00
SongFerngWang
7f69cca1a9
Fix the wrong comparison am: 1bcba3d23f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: I226de23b9e147ccf66cbbc57821b8244991f1363
2021-07-28 17:05:38 +00: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
9b02edad2b
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
am: 046c8d4a97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352
Change-Id: Ib7b517dea848d9f8c8e2d30bc180c700f7df10e5
2021-07-28 03:56:37 +00:00
Zoey Chen
6fd3e3cb5c
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
am: b1bd0b6d26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352
Change-Id: I37592a253e749af077b93215c8149dd5f2702b0c
2021-07-28 03:56:16 +00:00
Zoey Chen
b1bd0b6d26
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: Ib65987eb078f9fc0d6995470031d879cc1d8ece4
2021-07-28 03:41:00 +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
26424cb7b8
Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14
am: 70e4c3474a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293
Change-Id: Ie42b966a683b8478dedc1dbd6003e0d0ff1a0bd9
2021-07-27 17:59:38 +00:00
Joe Bolinger
ca784dd5df
Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14
am: 1841f0f132
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293
Change-Id: I9247aa39c6ca271175cd8634803935653aaf5e4e
2021-07-27 17:54:59 +00:00
Joe Bolinger
70e4c3474a
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: I39c616c70076dd98e24d138a0459d4914511a677
2021-07-27 17:43:00 +00: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
8a777b7c80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours am: 1c95bda96f
-s ours am: 596a6d3342
-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: I3dbbc9cc2d2a2e082e351dd891027801eaadb2d1
2021-07-27 07:28:56 +00:00
Bill Yi
26e5a702b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours am: 1c95bda96f
-s ours am: 927010cb2b
-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: I86bb699b2f895e0f00001e1d649c96bad56a1770
2021-07-27 07:27:55 +00:00
Bill Yi
927010cb2b
[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: I113635f56023acb41302b70bc86f327654ddd00f
2021-07-27 07:11:44 +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