Commit Graph

95708 Commits

Author SHA1 Message Date
ykhung
454698d97e Invoke close() method for BatteryUsageStats to close cursor window
invoke close() method for BatteryUsageStats to close cursor window,
since BatteryUsageStats will implement "Closeable" interface in T.
(from Dimitri's request)

Bug: 201229421
Test: make SettingsRoboTests
Change-Id: Ibfca404d00cce51405cffddb636f685869ac130b
2021-09-29 00:44:11 +08:00
ykhung
96a8e63ebd [Robustness] protect get battery stats from DeadSystemException am: e893a890ca am: f63b2e08da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926630

Change-Id: I3730258d026f39fe0e31e080128d812231ca3e00
2021-09-28 11:48:53 +00:00
ykhung
f63b2e08da [Robustness] protect get battery stats from DeadSystemException am: e893a890ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926630

Change-Id: I3b7223abc84971b2d9051d2c777a37c85404985a
2021-09-28 11:33:46 +00:00
ykhung
e893a890ca [Robustness] protect get battery stats from DeadSystemException
Refine the original workaround patch in the ag/15527095 from NPE to
return default BatteryUsageStats instance as we merged in the
ag/15919139 (align the same solution).

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Ic03e8296d16ecb8629155f75727e9cde48c303eb
2021-09-28 10:00:50 +00:00
YUKAI HUNG
592b2a76e0 [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours am: d9db89af86 -s ours am: 8f2938221a -s ours
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: Iaffdfdc6daa38a77a46dcd7fd730a973c04a7560
2021-09-28 08:07:21 +00:00
YUKAI HUNG
82d3ae0a27 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 0c99e2b1c8 am: f4d84faee7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I39d9df79aa6f8b237d701fabff606bad8418ed87
2021-09-28 08:07:16 +00:00
YUKAI HUNG
dfea91b1ae [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef am: 5e32dec664 -s ours am: 301bdd05d4 -s ours
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: Ie9e684d3cbc987f653f0026e9972a236d72e1036
2021-09-28 08:07:10 +00:00
YUKAI HUNG
8cb845c31e Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 4f513d7237 am: 3d6fc7d275
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I2ff62cabc826e97e5a887e36208eecdfe778f77c
2021-09-28 08:07:02 +00:00
YUKAI HUNG
8f2938221a [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours am: d9db89af86 -s ours
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: I04b9ecf8bf34eaa52aee9cb2e176c0de95024e9b
2021-09-28 07:53:44 +00:00
YUKAI HUNG
f4d84faee7 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 0c99e2b1c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I9d596ccce1459e92c244fb013e3933c0f357ffb8
2021-09-28 07:53:39 +00:00
YUKAI HUNG
301bdd05d4 [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef am: 5e32dec664 -s ours
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: Id1c00fe8ff9ad03edb8392331fd9613c07296197
2021-09-28 07:53:14 +00:00
YUKAI HUNG
3d6fc7d275 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 4f513d7237
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I235cc4cb1dfabccdcb901e2de5eca1a33a237ad0
2021-09-28 07:53:07 +00:00
YUKAI HUNG
5e32dec664 Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139

Change-Id: I92e32ec565c45d58b28c1430693f5fba11780844
2021-09-28 07:30:26 +00:00
YUKAI HUNG
d9db89af86 [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: I176606ea2e056d6cb109fdf4dc03b2fe7ceffdcb
2021-09-28 07:30:19 +00:00
YUKAI HUNG
0c99e2b1c8 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I71ccb502dc5e7697b5f54daa803a56bba1e2c565
2021-09-28 07:30:14 +00:00
YUKAI HUNG
4f513d7237 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: Icdc5d87aa5f41ab32fc546d0bd513d505bcebd51
2021-09-28 07:30:13 +00:00
YUKAI HUNG
36072e86ef Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev 2021-09-28 07:19:59 +00:00
YUKAI HUNG
4a4f13d5b0 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev 2021-09-28 07:12:01 +00:00
PETER LIANG
a507085d09 Merge "Add the max height restriction into the illustration view." into sc-v2-dev am: 65faee72f5 am: 7260fe0330
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809052

Change-Id: Id6051ae6b6e43bd78375beee27eb5982423de400
2021-09-28 06:13:05 +00:00
PETER LIANG
7260fe0330 Merge "Add the max height restriction into the illustration view." into sc-v2-dev am: 65faee72f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809052

Change-Id: Id9e4ca6f0c53a8924b75c7c31120d9776f9469de
2021-09-28 05:58:52 +00:00
PETER LIANG
65faee72f5 Merge "Add the max height restriction into the illustration view." into sc-v2-dev 2021-09-28 05:43:21 +00:00
TreeHugger Robot
7ca53ecfcd Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev am: 244e0f536b am: 209210b0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895171

Change-Id: I708e9829085f23a6a2dd2c0e93d69cec93679be8
2021-09-28 04:53:15 +00:00
TreeHugger Robot
209210b0b6 Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev am: 244e0f536b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895171

Change-Id: I07b2b389806a8eea5093c8b3bb8035f25cf26789
2021-09-28 04:38:50 +00:00
TreeHugger Robot
244e0f536b Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev 2021-09-28 04:23:19 +00:00
Curtis Belmonte
1fb716d892 Make biometric setting toggles show dynamic auth types am: a9c582262e am: 52d3b2b802
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15925915

Change-Id: I1cf633c0e5792ad2ca0dcc08a11344499888c1ef
2021-09-28 01:28:09 +00:00
Curtis Belmonte
52d3b2b802 Make biometric setting toggles show dynamic auth types am: a9c582262e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15925915

Change-Id: I7e254e16a0c2de4b891f287f2339d4d12f603efb
2021-09-28 01:13:53 +00:00
Curtis Belmonte
a9c582262e Make biometric setting toggles show dynamic auth types
Updates the preference toggles shown on the combined biometric settings
screen to indicate which types of biometric sensor (e.g. face and/or
fingerprint) each setting applies to. This is done by checking the
maximum registered strength for each type of sensor.

Test: Manual

Bug: 193714498
Bug: 201306569
Change-Id: I1f27bbe1fdd172ebc899c3c5f1daef9095b338bd
2021-09-27 15:55:43 -07:00
Bill Yi
e959dc02ab Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868 am: 61e7977aaa am: 9cd92a0212
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: I3fcee386026409f435800aed523773ecb972b155
2021-09-27 16:46:41 +00:00
Bill Yi
1033e7f269 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: fe3544e435 -s ours am: e605139474 -s ours am: f983612681 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e06ca11f5b3eb41873f4265b4c240a1fd26ebee
2021-09-27 16:46:40 +00:00
Bill Yi
61bd8e0e1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6 -s ours am: cf07eec3b7 -s ours am: fe5fb6323f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c89ca9474c4e03fcdadeb39bc505fd99b32e68f
2021-09-27 16:45:42 +00:00
Julia Reynolds
78cd494c0d Always return the same result code in access screens am: 1aff9c726a am: c86d3d5218 am: f002a2b527
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133

Change-Id: I539f8445229a1bb536162c8970d4426054d5e409
2021-09-27 16:45:21 +00:00
Bill Yi
02d1181905 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: 7e253fafe9 -s ours am: d7f9802a7a -s ours am: eb8f294624 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b64b3d745869adafdff419ac36bd37bff93c491
2021-09-27 16:44:19 +00:00
Bill Yi
2849249218 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: ee7f088a94 -s ours am: 386c12938e -s ours am: 8ac488e457 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I294448901e7e2a287c23818c699a63ed52f154bf
2021-09-27 16:43:47 +00:00
Bill Yi
aaa1498de3 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac am: 51be62033b am: e4b5e15e28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: Ic5f6708ed5a9d601f79ed80d95301d0d24ed1a45
2021-09-27 16:43:01 +00:00
Bill Yi
7c7c2f7e60 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: c038db5354 -s ours am: 1c3d6efc94 -s ours am: 88861877a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c89201d420210e74b11fcdd49ca0540fc08ebb4
2021-09-27 16:42:59 +00:00
Bill Yi
bd5b6c04b8 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417 am: b1c97edfbf am: 72fdb0b8aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: I687280e0948868ee22628ac9e915f38653233c2a
2021-09-27 16:41:11 +00:00
Bill Yi
c367f280d5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: 3732defccb -s ours am: 9ffcace688 -s ours am: dc077e2701 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ea1fd54efcd994abe5dc828f0e843fa583970a9
2021-09-27 16:41:09 +00:00
TreeHugger Robot
1df1581871 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 16ab663f53 -s ours am: 3d98b16f9f -s ours am: 6bd56eb45e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8860132f459dd8f4322dbc998baca9ed7a1ea177
2021-09-27 16:39:51 +00:00
Bill Yi
da00c1923b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: f78bbdeedc -s ours am: cd6592d352 -s ours am: bab113a283 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94b676ae22028376d3b45d0c5c3b2e5bab3f8826
2021-09-27 16:38:07 +00:00
TreeHugger Robot
0e0139ec66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8 -s ours am: d508fbf43b -s ours am: 3c2091fc40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fb4a6244a5c4065d50924f7ac46720e15edcaec
2021-09-27 16:36:58 +00:00
TreeHugger Robot
42f9901966 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27 -s ours am: d263a1305d -s ours am: cc53ea6c8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I206a18a046e9e04dd82c4fc42031710fe8621c35
2021-09-27 16:35:17 +00:00
TreeHugger Robot
a6405b71a8 Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7 am: 6a9d8bc5bc am: fba9d96a43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168

Change-Id: Ida5d3110bcd1c3e981cda2fcb30d782f8ee20ca8
2021-09-27 16:31:24 +00:00
Bill Yi
9cd92a0212 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868 am: 61e7977aaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: Ief847629af5c6cddcdc6ce0e9d8ccb678651243e
2021-09-27 16:22:18 +00:00
Bill Yi
f983612681 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: fe3544e435 -s ours am: e605139474 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba07514c3f1d8cd8fc1e86ec51534b357e5f00cc
2021-09-27 16:22:17 +00:00
Bill Yi
fe5fb6323f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6 -s ours am: cf07eec3b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7a9e76352a0813310c3e00f625593bec33d5227
2021-09-27 16:22:03 +00:00
Julia Reynolds
f002a2b527 Always return the same result code in access screens am: 1aff9c726a am: c86d3d5218
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133

Change-Id: Icc3081af08a294db546d019e14029f486837756f
2021-09-27 16:21:41 +00:00
Bill Yi
eb8f294624 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: 7e253fafe9 -s ours am: d7f9802a7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55ed0274fd73722c1130674a24abd074f126ce30
2021-09-27 16:21:11 +00:00
Bill Yi
8ac488e457 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: ee7f088a94 -s ours am: 386c12938e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ffc70b34d38613ffc67d8fcfc4ba8d1d1a366f0
2021-09-27 16:20:36 +00:00
Bill Yi
e4b5e15e28 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac am: 51be62033b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: I41adf219182614382c85bb30ec403f70a3a37f9d
2021-09-27 16:17:11 +00:00
Bill Yi
88861877a8 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: c038db5354 -s ours am: 1c3d6efc94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id59d4b07bddfcc2191b82b03dc4218ef9ae9fead
2021-09-27 16:17:10 +00:00