Commit Graph

76790 Commits

Author SHA1 Message Date
Kevin Chyn
e67a0afc41 3/n: verifyCredential no longer returns RequestThrottledException
Bug: 161765592

Test: Accept/Reject/Lockout on the following
      1) Owner profile
      2) Managed profile with separate challenge
      3) Managed profile with unified challenge
Change-Id: Ia7b670a29e9e8ee1fe65bd09965a454601a06871
2020-08-07 12:17:41 -07:00
Kevin Chyn
fbc2ec831f 2/n: Add setRequestGatekeeperPassword to ChooseLockSettingsHelper
This change adds the plumbing on Settings side for ConfirmLock*.
ChooseLock* will be done in a follow-up CL. The changes in this CL
are not invoked by any code path yet. This will also be integrated
in a follow-up CL.

Bug: 161765592

Perform the following with a local change to use
ChooseLockSettingsHelper#setRequestGatekeeperPassword(true)

Test: GK PW is received when setRequestGatekeeperPassword(true)
Test: GK PW + Challenge sent to GK, GK verifies and caller receives
      GK HAT successfully

Change-Id: Ibd809784b5599343f34836bc5f3e709627b7f22a
2020-08-07 12:17:41 -07:00
TreeHugger Robot
d0403e27ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a5d22b1b18 -s ours am: 8d2b8304ac -s ours am: e2a1875887 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia446711f69b349e9493ffd15d54211ca391c88d0
2020-08-07 18:33:59 +00:00
TreeHugger Robot
602799a4c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d032e7ac90 -s ours am: 171d1b98f6 -s ours am: c4982d0487 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b3be5e872e636334932ace217d452616f379530
2020-08-07 18:33:22 +00:00
TreeHugger Robot
e2a1875887 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a5d22b1b18 -s ours am: 8d2b8304ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73e317f7e780bbc08f9ce0c5b9c1ea80f09269e8
2020-08-07 18:15:06 +00:00
TreeHugger Robot
c4982d0487 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d032e7ac90 -s ours am: 171d1b98f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5602033882e8b38ebeadf98b3a67ebeb077958a8
2020-08-07 18:14:52 +00:00
TreeHugger Robot
8d2b8304ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a5d22b1b18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0a60ed433906d7f8d95c7cbd60a7c352dec72b7
2020-08-07 17:57:56 +00:00
TreeHugger Robot
171d1b98f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d032e7ac90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d47939545848a89498c68db785a7c4da95a6e71
2020-08-07 17:57:47 +00:00
TreeHugger Robot
a5d22b1b18 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-07 17:41:57 +00:00
TreeHugger Robot
d032e7ac90 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-07 17:39:13 +00:00
Automerger Merge Worker
47b21e8d3b Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 352259e384 -s ours" into rvc-qpr-dev-plus-aosp am: 0fe2efd3be -s ours am: c8b21a36e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I506c5d64d76f49d96da87b8e0df78b1196ca6092
2020-08-07 15:40:24 +00:00
TreeHugger Robot
c6712270bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 203bb3924e -s ours am: ae418fc5e8 -s ours am: 327d75efb5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaf1b4bf6c143456b0df98e912c9d43f806e368d9
2020-08-07 15:39:52 +00:00
Automerger Merge Worker
c8b21a36e2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 352259e384 -s ours" into rvc-qpr-dev-plus-aosp am: 0fe2efd3be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d61d71a409a6fffc0304164c3ad5967e695c5bd
2020-08-07 15:24:32 +00:00
TreeHugger Robot
327d75efb5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 203bb3924e -s ours am: ae418fc5e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56d83cb788910b770357377315bbda6d411a0bfa
2020-08-07 15:24:05 +00:00
Automerger Merge Worker
0fe2efd3be Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 352259e384 -s ours" into rvc-qpr-dev-plus-aosp 2020-08-07 15:11:01 +00:00
TreeHugger Robot
9f783aa73b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 352259e384 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc5daff87a690f0593f4beee30e0c5faed8460a8
2020-08-07 15:10:56 +00:00
TreeHugger Robot
ae418fc5e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 203bb3924e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3396b7edb5cf9599ca36236139f4737668025bc
2020-08-07 15:10:53 +00:00
TreeHugger Robot
da3c964880 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 26fb956d9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9068aa223c229745cb5fcdb05a3379f5a164d50a
2020-08-07 15:02:02 +00:00
TreeHugger Robot
ecfff9c462 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 39561de47b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib04e6dfe40f4d90ad659f4d7d186d596213238f9
2020-08-07 15:01:54 +00:00
TreeHugger Robot
352259e384 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica5ba9d21d38210c1cb7ec597f314736fd34707d
2020-08-07 15:01:31 +00:00
TreeHugger Robot
203bb3924e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia45d69e65757280f755404f1209c12ac5b17ba59
2020-08-07 15:01:27 +00:00
TreeHugger Robot
26fb956d9f Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-07 14:54:19 +00:00
TreeHugger Robot
39561de47b Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-07 14:51:49 +00:00
TreeHugger Robot
1da29b3f77 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-07 14:45:54 +00:00
TreeHugger Robot
2f727f2de1 Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev am: edd587c2a6 am: 48d768b00c am: 2acae9df4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12167384

Change-Id: I0557a8faa3180e713c4f9e2c44d9e756347119a8
2020-08-07 12:05:20 +00:00
TreeHugger Robot
ebf9302eb9 Merge "Update strings for swipe bottom to notification preference" am: fc455e6e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326245

Change-Id: Ib5cedae6d74f38ae835a2d1fdaed39dc85956f97
2020-08-07 12:05:01 +00:00
TreeHugger Robot
2acae9df4a Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev am: edd587c2a6 am: 48d768b00c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12167384

Change-Id: I559cee4b76432f72cab16b926ad7d8a2f87abedc
2020-08-07 12:04:56 +00:00
TreeHugger Robot
fc455e6e50 Merge "Update strings for swipe bottom to notification preference" 2020-08-07 11:50:21 +00:00
TreeHugger Robot
48d768b00c Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev am: edd587c2a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12167384

Change-Id: I41175eb59b2cea6dfeb97d1413ab6c4846ddb844
2020-08-07 11:49:39 +00:00
TreeHugger Robot
edd587c2a6 Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev 2020-08-07 11:37:27 +00:00
Edgar Wang
ed45314758 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: Idf3cb1eca8b814d5863f286f6a46f79fc5e7a967
2020-08-07 10:25:06 +00:00
Arc Wang
376f648e3c Merge "[adb-wireless] Allow users copy 'IP address & Port' in Wireless debugging" am: a09422d6d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12323063

Change-Id: Ie8eb4a487065046475099f5aa625a2667c72e372
2020-08-07 09:16:40 +00:00
Arc Wang
a09422d6d9 Merge "[adb-wireless] Allow users copy 'IP address & Port' in Wireless debugging" 2020-08-07 09:05:56 +00:00
The Android Open Source Project
7b6716fca6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic6ae316705dbbaeae8fdc65d64073c19a07fbd04
2020-08-07 01:47:32 -07:00
Sneh Bansal
da432283cf Prevent errors when updating operator pref summary
The response for manual network selection request may come after the
fragment that displays the search results is already destroyed, say
when the user moves out of the results screen. In this case, attempting
to update the summary for the chosen operator preference leads to an
exception.

Check whether the preference to be updated is still valid before
attempting to update its summary.

Bug: 161422555
Test: Manually tested - verified that no exception was thrown when the
response of manual network selection request was received after the
fragment was destroyed.
Change-Id: I087c0e101fa75f229bc4353defbb14e8bf30153f
2020-08-07 16:34:48 +08:00
Bonian Chen
9c0932d500 [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours am: 6343b81231 -s ours am: e6ba59fc7b -s ours am: d29596e18a -s ours am: ed454ae6cb -s ours
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: I3faa62847a582111beffd06b11f7e5fbec8c469f
2020-08-07 08:08:34 +00:00
Bonian Chen
a45b7cedb3 [automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours am: f1dbf2bd5e -s ours am: e3cb875f3f -s ours am: d455229ab9 -s ours am: 9292ad91c9 -s ours
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

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

Change-Id: I5c425ae84cff3646eec3c4ea9ae30fe700cb908e
2020-08-07 08:08:25 +00:00
The Android Open Source Project
917147963d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia9859f2efde98900bf6e743cef2a39fe1232cb5e
2020-08-07 01:00:57 -07:00
Bonian Chen
ed454ae6cb [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours am: 6343b81231 -s ours am: e6ba59fc7b -s ours am: d29596e18a -s ours
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: If19e68d5130eecbf744f1f88e10efefb7746f89b
2020-08-07 07:58:50 +00:00
Bonian Chen
9292ad91c9 [automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours am: f1dbf2bd5e -s ours am: e3cb875f3f -s ours am: d455229ab9 -s ours
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

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

Change-Id: I96a3800fbcf561a92f43d690fd1397b280d647e5
2020-08-07 07:58:30 +00:00
Bonian Chen
e3f6b13fb0 [Settings] Code refactor
Remove unused import

Bug: 10956255
Test: build pass
Merged-In: I256870483d85bf7000556357071834cad24884d1
Change-Id: Iced417b1e84ac082ec9bdffb0634ca9d4597e9e1
2020-08-07 07:51:35 +00:00
Bonian Chen
d29596e18a [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours am: 6343b81231 -s ours am: e6ba59fc7b -s ours
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: I21d38488fb8258df484cbe3b1db177bd436d00cc
2020-08-07 07:45:43 +00:00
Bonian Chen
3f3710dcb3 [automerger skipped] Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 am: 9a5a1eabb6 -s ours am: c753471a4d -s ours am: f9aea105d9 -s ours am: aecd813846 -s ours am: 31c03589c3 -s ours
am skip reason: Change-Id I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e with SHA-1 ff11f200c8 is in history

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

Change-Id: I6cd642453a6829a8c3e266e9a2c5fb9e2d1dbc18
2020-08-07 07:45:43 +00:00
Bonian Chen
d455229ab9 [automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours am: f1dbf2bd5e -s ours am: e3cb875f3f -s ours
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

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

Change-Id: If9768b2782276ae7fafca08a0e44175556101129
2020-08-07 07:45:34 +00:00
Bonian Chen
e6ba59fc7b [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours am: 6343b81231 -s ours
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: Ie22e3768e0b311d7b27e02740271e51ee951895b
2020-08-07 07:37:09 +00:00
Bonian Chen
e3cb875f3f [automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours am: f1dbf2bd5e -s ours
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

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

Change-Id: I861eaf0ca9e26c3793169399f287cfc6351e312b
2020-08-07 07:37:01 +00:00
Bonian Chen
31c03589c3 [automerger skipped] Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 am: 9a5a1eabb6 -s ours am: c753471a4d -s ours am: f9aea105d9 -s ours am: aecd813846 -s ours
am skip reason: Change-Id I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e with SHA-1 ff11f200c8 is in history

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

Change-Id: If0165edb086778132de6c66adaaa010c82a11c38
2020-08-07 07:36:57 +00:00
SongFerngWang
1dc9ae1f34 Manual selection item's data icon is wrong
If level is the same previous level, the icon didn't updated.

Bug: 162505961
Test: fake the list and check item's icon. PASS
Change-Id: I6c40bfb40fe0d1c5d576b8cc0bc5190d9ab3ef04
2020-08-07 07:35:13 +00:00
Bonian Chen
6343b81231 [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: I242f384a9374e8d0b8c7a4121839140ab1d174fc
2020-08-07 07:26:44 +00:00
Bonian Chen
aecd813846 [automerger skipped] Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 am: 9a5a1eabb6 -s ours am: c753471a4d -s ours am: f9aea105d9 -s ours
am skip reason: Change-Id I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e with SHA-1 ff11f200c8 is in history

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

Change-Id: If8d71349cd40c8c8f0490a8ea0c2bda429ea1304
2020-08-07 07:26:32 +00:00