Bonian Chen
efb6d09d0f
[automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea
am: d97cb511ac
-s ours am: daa07ea2d6
-s ours
...
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368
Change-Id: I6292dce2e89cbff4486490af0ae08115478b855a
2020-08-10 06:46:52 +00:00
Bonian Chen
daa07ea2d6
[automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea
am: d97cb511ac
-s ours
...
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368
Change-Id: I4fe7fe78122bfd753f9c407a5e3013c0886d4623
2020-08-10 06:27:20 +00:00
Bonian Chen
d97cb511ac
Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368
Change-Id: I252c98b9f0f17c42cd8b38d724a68d22db3626ca
2020-08-10 06:10:02 +00:00
Bonian Chen
c1ec7f1fea
Merge "Replaced reference to setPreferredNetworkType"
2020-08-10 05:51:23 +00:00
PETER LIANG
44f812513d
Merge "Fix the screen scrolling down after enabling dark theme." am: 946dafab93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12324933
Change-Id: Ib36b5813e94a51d9bb0c81301819b13af14cb972
2020-08-10 04:11:16 +00:00
PETER LIANG
946dafab93
Merge "Fix the screen scrolling down after enabling dark theme."
2020-08-10 03:56:44 +00:00
Bill Yi
ca593c59ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e85177b1bc1790aa8af1563db011d61249a4056
2020-08-09 09:26:09 -07:00
Bill Yi
4de9e4f5eb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours am: 88558e8940
-s ours am: c19f0a3aab
-s ours am: 502c4207f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452
Change-Id: I2c12a777bc3d8f0af07d6e4e4ba298613b216300
2020-08-08 20:54:41 +00:00
Bill Yi
3820e26133
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours am: 064ba89fc3
-s ours am: b8a813bb24
-s ours am: be15bdbc8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452
Change-Id: I44b4eb57723e6d505ba574c41e277c1ddf0c376a
2020-08-08 20:54:11 +00:00
Bill Yi
502c4207f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours am: 88558e8940
-s ours am: c19f0a3aab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452
Change-Id: I25752bf3e4f3e1b51416ea923cd872049498d9b8
2020-08-08 20:35:52 +00:00
Bill Yi
be15bdbc8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours am: 064ba89fc3
-s ours am: b8a813bb24
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452
Change-Id: I619861f453915a735a1c2a507e5aa39c084e2250
2020-08-08 20:35:46 +00:00
Bill Yi
59e2be3b6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e18f9f537
-s ours am: 10e95dc4d8
-s ours am: 294dd34b0e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12339316
Change-Id: Ib4282f99ccc2e768941c77ff2d20a6d2c59635d8
2020-08-08 20:23:55 +00:00
Bill Yi
c19f0a3aab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours am: 88558e8940
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452
Change-Id: Id678d1fe415daee63ec0c0395c0fb276c48dece6
2020-08-08 20:17:23 +00:00
Bill Yi
b8a813bb24
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours am: 064ba89fc3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452
Change-Id: Ie242c290b510311f48b8804fe3e79874de90e3cf
2020-08-08 20:16:18 +00:00
Bill Yi
294dd34b0e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e18f9f537
-s ours am: 10e95dc4d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12339316
Change-Id: I0615bafddf68242ff46d99b86b26ec11d9e2cc48
2020-08-08 20:08:16 +00:00
Bill Yi
88558e8940
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452
Change-Id: I77c4998fa1886c8768626db6f8c3848160bf00a2
2020-08-08 19:59:01 +00:00
Bill Yi
064ba89fc3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452
Change-Id: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
2020-08-08 19:57:42 +00:00
Bill Yi
10e95dc4d8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e18f9f537
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12339316
Change-Id: I5e6cf5a03b4cef0d9e45ddd55e048376bafc7e16
2020-08-08 19:49:23 +00:00
Bill Yi
23f76ec2e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b031fca9f3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12339318
Change-Id: I5a7ac6d675ef52f71404be0a6fcf729e8d520819
2020-08-08 19:48:18 +00:00
Bill Yi
b031fca9f3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6151b580d988f38123ccfda9f2d944dca6f90e4f
2020-08-08 17:30:16 +00:00
Bill Yi
7e18f9f537
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I49ca37ad76af4049e36d41140610b131f99bf46e
2020-08-08 16:11:50 +00:00
Bill Yi
80d8d4d07c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9584a9b4b73a955be75ed4957eeb01e88a6c745a
2020-08-08 15:32:24 +00:00
Kevin Chyn
c7388cf7cf
Merge changes from topics "async-challenge", "lss-sp" am: c0f4353b9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12276443
Change-Id: I965120b6ee113cd4ade325054068de52326c7663
2020-08-08 00:10:15 +00:00
Kevin Chyn
c67d7f51fc
BiometricEnrollIntro should use non-blocking generateChallenge am: 66bfe45f99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12276442
Change-Id: Ib3bc708fb8bce148e2828fb63f47287629f427d6
2020-08-08 00:10:13 +00:00
Kevin Chyn
7465a07b46
4/n: Remove challenge from choose/confirm, use new path am: 7b0867c6d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12213745
Change-Id: I0d6e8c56a744d343773a3d02012aeda01781bade
2020-08-08 00:10:11 +00:00
Kevin Chyn
19ed437a5c
3/n: verifyCredential no longer returns RequestThrottledException am: e67a0afc41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12222935
Change-Id: If8b089662ebcd3a4253287d14c5d652cb2331adf
2020-08-08 00:10:09 +00:00
Kevin Chyn
b6101803df
2/n: Add setRequestGatekeeperPassword to ChooseLockSettingsHelper am: fbc2ec831f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12212655
Change-Id: I4040f37063aa6722dc11c928f68e949d6cc29d5a
2020-08-08 00:10:06 +00:00
Kevin Chyn
c0f4353b9d
Merge changes from topics "async-challenge", "lss-sp"
...
* changes:
Remove remainder of generateChallengeBlocking
BiometricEnrollIntro should use non-blocking generateChallenge
4/n: Remove challenge from choose/confirm, use new path
3/n: verifyCredential no longer returns RequestThrottledException
2/n: Add setRequestGatekeeperPassword to ChooseLockSettingsHelper
2020-08-08 00:05:53 +00:00
Jay Aliomer
b569dfdac8
Time for dark theme doesnt format 24 hr correctly
...
Fixes: 163048376
Test: Manual
Change-Id: Ia6c2633408670656c2b42bfb724aaf900561682e
2020-08-07 23:43:09 +00:00
Kevin Chyn
66bfe45f99
BiometricEnrollIntro should use non-blocking generateChallenge
...
GenerateChallenge used to block when showing the credential screen.
Now that GenerateChallenge is moved to after the credential screen
is shown, we need to delay the next button instead. This is generally
non percievable to the user, but this is more robust against busy
system server.
Fixes: 161325267
Test: Enroll fingerprint/face device
Change-Id: I0fbbef8bf469e32bed251acf22556ad2ea8e2933
2020-08-07 12:49:37 -07:00
Kevin Chyn
bee84e2daa
Remove remainder of generateChallengeBlocking
...
Test: make -j56 RunSettingsRoboTests
Face Tests:
Test: Open face settings, remove face, add face
Test: Open face settings, but cancel credential confirmation.
Face settings does not show up
Test: adb shell am start -a android.app.action.SET_NEW_PASSWORD
Able to enroll face
Fingerprint Tests:
Test: Open fingerprint settings, add button is shown
Test: Open fingerprint settings, but cancel credential confirmation.
Fingerprint settings does not show up
Test: adb shell am start -a android.app.action.SET_NEW_PASSWORD
Able to enroll fingerprint
Bug: 162533680
Change-Id: Ie448ed086e73b0b545bd3a2e62437c543f7aad6c
2020-08-07 12:49:37 -07:00
Kevin Chyn
7b0867c6d3
4/n: Remove challenge from choose/confirm, use new path
...
Biometric enrollment will not request a Gatekeeper HAT during
initial credential setup or credential confirmation anymore.
Instead, it is broken down into the following steps now.
Bug: 161765592
1) Request credential setup / confirmation to return a
Gatekeeper Password
2) Biometric enrollment will generate a challenge
3) Biometric enrollment will request LockSettingsService to
verify(GatekeeperPassword, challenge), and upon verification,
the Gatekeeper HAT will be returned.
Since both LockSettingsService and Biometric enroll/settings
make use of biometric challenges, this allows us to make the
challenge ownership/lifecycle clear (vs. previously, where
LockSettingsService has no idea who the challenge belongs to).
Exempt-From-Owner-Approval:For files not owned by our team,
(StorageWizard), this change is just a method rename
Test: RunSettingsRoboTests
Run the following on face/fingerprint devices
Test: Remove credential
adb shell am start -a android.app.action.SET_NEW_PASSWORD
Set up credential + fingerprint
Test: Remove credential,
adb shell am start -a android.settings.FINGERPRINT_SETTINGS
This tests the ChooseLock* logic in FingerprintSettings
Test: Set up credential,
adb shell am start -a android.settings.FINGERPRINT_SETTINGS
This tests the ConfirmLock* logic in FingerprintSettings
Test: Remove device credential, enroll fingerprint/face. Succeeds.
This tests the ChooseLock* returning SP path from
BiometricEnrollIntro
Test: With credential and fingerprint/face enrolled, go to
fingerprint/face settings and enroll. This tests the
ConfirmLock* path in Fingerprint/FaceSettings
Test: Remove device credential, enroll credential-only, enroll
fingerprint/face separately. Succeeds. This tests the
ConfirmLock* returning SP path in BiometricEnrollIntro
Test: In SUW, set up credential, then biometric. This tests
the ChooseLock* path in SUW
Test: In SUW, set up credential, go back, then set up biometric.
This tests the ConfirmLock* path in SUW
Change-Id: Idf6fcb43f7497323d089eb9c37125294e7a7f5dc
2020-08-07 12:49:15 -07:00
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