Commit Graph

57097 Commits

Author SHA1 Message Date
Kevin Chyn
1c1191b640 Do not request cancel authentication unless currently authenticating
am: 49c7d07650

Change-Id: Id38d3648f75a79a3492677416c79fff960317a69
2019-07-26 17:48:44 -07:00
Kevin Chyn
e27a304b97 Add ability to finish() ConfirmDeviceCredential if it loses foreground
If user enters face settings but does not enter the password, then
turns off the screen, it's possible the challenge is invalidated. Instead,
we should finish() the device credential screen as well as FaceSettings.

This prevents
1) The user from being prompted for credential with lack of context
2) Credential returning a HAT that wraps an invalidated challenge

The user will be returned to the security settings screen, where they
have more context and can decide if they want to enter face settings again.

Fixes: 138273242

Test: 1) Open face settings, do not enter password
      2) Press power button
      3) Unlock keyguard
      4) User is not presented with credential screen
Test: Go through SUW, turning on/off the screen at various security
      screens. Able to enroll successfully

Change-Id: I3c3d4600138012821bb0eea7d2927df00011cdb0
2019-07-26 16:42:14 -07:00
Kevin Chyn
c785b03c84 Merge "Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d am: 6fdc3745c3" into qt-qpr1-dev-plus-aosp
am: 6d3614f8f0

Change-Id: I96abb2f6f27544b8ad5f508b7d8c7f26249bd9a3
2019-07-26 13:16:22 -07:00
Kevin Chyn
73d94f79e1 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d am: 6d549437af
am: 75517cb6a8

Change-Id: I76ed62db979d0729269e47b35ac607ce09aae244
2019-07-26 13:13:57 -07:00
Android Build Merger (Role)
6d3614f8f0 Merge "Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d am: 6fdc3745c3" into qt-qpr1-dev-plus-aosp 2019-07-26 19:46:32 +00:00
Kevin Chyn
fa1aea0847 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d
am: 6fdc3745c3

Change-Id: I79ffdd76bf57df0bf7ba0ef0b5c4a815f2623f00
2019-07-26 12:46:09 -07:00
Kevin Chyn
75517cb6a8 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d
am: 6d549437af

Change-Id: If055528ab0d92318fc552c2396465cecd8e5acea
2019-07-26 12:45:44 -07:00
Kevin Chyn
3090fc975e Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am: ba4fad160d

Change-Id: I89a892d9b5a626d236031a4e345297c791c8950b
2019-07-26 12:44:44 -07:00
Kevin Chyn
6fdc3745c3 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am: ba4fad160d

Change-Id: Iea3b2552097a1decd9dc106e3a31d71d772ab1d6
2019-07-26 12:35:33 -07:00
Kevin Chyn
6d549437af Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am: ba4fad160d

Change-Id: Ie71d66f43e21821b0ccac003d02878f011e63f18
2019-07-26 12:35:30 -07:00
Julia Reynolds
c400ce3c80 Move channel listing into a pref controller
And a hidden preference category. This makes
hiding/showing the list a lot cleaner and also allows more
of the code to be tested.

Also delete some unused code that no longer complied after
this refactor.

Fixes: 133443871
Test: atest
Change-Id: I4a5fe0e075019bae2df44a0a9dcec26a40ee6d12
(cherry picked from commit a295d71c94)
2019-07-26 19:24:43 +00:00
Julia Reynolds
19c4ea4da1 Fix launching of work profile notif settings
Test: manual
Fixes: 132289017
Change-Id: I3c177aae1f4dd46556b652253d24b225d01987eb
(cherry picked from commit 142920e0c2)
2019-07-26 19:24:17 +00:00
Kevin Chyn
49c7d07650 Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.

BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.

The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.

Bug: 138279856

Test: BiometricPromptDemo, enable device credential fallback, get into
      lockout state, successfully enter password. API result is
      success instead of "canceled" now.

Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
2019-07-26 12:21:51 -07:00
Kevin Chyn
ba4fad160d Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev 2019-07-26 19:15:50 +00:00
Antony Sargent
efa7716533 Refesh mobile network details page on carrier config changes
In general the mobile network details page has several preference
controllers that don't listen to carrier config changes, so instead of
having each one add a listener, we instead just have one listener and
refresh the entire page when we see the broadcast.

Fixes: 135587885
Test: make RunSettingsRoboTests
Change-Id: Iff5b28dbfe12d94c901b442b23cece8e68218983
2019-07-26 12:00:39 -07:00
Bill Yi
c61ed17d81 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd -s ours am: 957463ca00 -s ours
am: 1639371bcd -s ours
am skip reason: subject contains skip directive

Change-Id: Ie32b100cdb5015e788e9ed5c14f90a0c5d437421
2019-07-26 11:44:15 -07:00
Bill Yi
625f46f62b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd -s ours am: 8611a6d851 -s ours
am: b0e9f90cee -s ours
am skip reason: subject contains skip directive

Change-Id: If115a01ae406ba9e84a8a2e45bcde7bdaa190010
2019-07-26 11:43:34 -07:00
Android Build Merger (Role)
1639371bcd Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd -s ours am: 957463ca00 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-07-26 18:33:45 +00:00
Bill Yi
8d715770e1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd -s ours
am: 957463ca00 -s ours
am skip reason: subject contains skip directive

Change-Id: I8669d27559f0586d0d8401f6395e900a1a98f92d
2019-07-26 11:33:29 -07:00
Bill Yi
b0e9f90cee [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd -s ours
am: 8611a6d851 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia14c2a36c4de7485f77c634aef5cadfc47bb1a50
2019-07-26 11:33:28 -07:00
Bill Yi
d00bbf9cfd [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8b9c85f0cd -s ours
am skip reason: subject contains skip directive

Change-Id: I4d148c45928fdfb046dcfb3443b68cdc4903038e
2019-07-26 11:22:31 -07:00
Bill Yi
8611a6d851 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8b9c85f0cd -s ours
am skip reason: subject contains skip directive

Change-Id: I764355107924ecc67919bfbd1b134017aa07d5ca
2019-07-26 11:22:31 -07:00
Bill Yi
957463ca00 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8b9c85f0cd -s ours
am skip reason: subject contains skip directive

Change-Id: I3dabad25e5640239b491c864a999156156e77552
2019-07-26 11:22:30 -07:00
Kevin Chyn
0a33d62a17 Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.

BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.

The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.

Bug: 138279856

Test: BiometricPromptDemo, enable device credential fallback, get into
      lockout state, successfully enter password. API result is
      success instead of "canceled" now.

Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
2019-07-26 11:20:10 -07:00
TreeHugger Robot
8b9c85f0cd Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-26 17:39:58 +00:00
Kevin Chang
9f834959d3 Add gesture navigation setting into a11y settings
Add new entry for gesture navigation setting in accessibility settings

Bug: 130362168
Test: Visual
Change-Id: I704ccb40ef913535948b83b439df9f708a89ca46
2019-07-26 19:00:19 +08:00
Raff Tsai
d22b79e4b6 Fix robolectric test fail
Fixes: 138417946
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core.codeinspection.CodeInspectionTest"
Change-Id: Id21a57b334fc4d26feaa6ca312c1af47ec8b4abe
2019-07-26 16:11:28 +08:00
Bill Yi
9dff9b9c52 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I84fe706da2873676a567287114abc4e6a27c158c
2019-07-25 18:34:18 -07:00
Yanting Yang
a299fc5435 Fix NPE of launching Settings with malicious URL
Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e
2019-07-25 21:40:28 +08:00
Jason Chiu
32930dbe4e Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings
"Ambient display" was merged into "Lock screen display", and the entry
was also moved from security page to display page and leveraged the
original user restriction of "Ambient display".

The user restriction should just work on the switch of Ambient display
instead of the "Lock screen display" entry.

Bug: 138177691
Test: robotest, visual
Change-Id: I5db0eb68c3aa6f4f7d8ecd42db2cdc72255b12f7
2019-07-25 16:23:12 +08:00
Arc Wang
eca48078d5 [Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit - II
Refine code:
1. Change method name from getSpinnerAdapterWithEapMethods to getSpinnerAdapter
   and apply it to other Spinner adapters.
2. Change method name from getSpinnerArrayWithEapMethodsTts to
   getSpinnerAdapterWithEapMethodsTts and it will
   setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
   for adapters.
3. Remove the code of ag/8693033
4. Improve indentation.

Bug: 135127581
Test: WifiConfigControllerTest
Change-Id: I653eda11ca1b8235c5ecaa1a826a2fddd004d2e1
2019-07-25 14:51:35 +08:00
Arc Wang
6351f7c37a [Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit - I
1. Only support EAP-TLS for WPA3-Enterprise 192-bit
2. Remove "Do not validate" from the CA certificate menu
3. Remove "Do not provide" from user certificate menu

To reduce review effort, I left refine code change in another CL.

Bug: 135127581
Test: WifiConfigControllerTest
Change-Id: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
2019-07-25 14:27:41 +08:00
android-build-team Robot
81fb5e28c1 Merge cherrypicks of [8828839, 8824129, 8828883, 8828885, 8828888, 8828891, 8829076, 8828998, 8828999, 8828607, 8828957] into qt-release
Change-Id: Idb76a2a8d5818e896f2590513c27c9a42c55e8f8
2019-07-25 04:12:54 +00:00
Peiyong Lin
ac52d90a6c Remove prerelease driver option from Settings UI.
BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
(cherry picked from commit c2dfba01ca)
2019-07-25 04:12:17 +00:00
android-build-team Robot
297d487c8c Snap for 5753328 from 7c5bb0ecda to qt-c2f2-release
Change-Id: Ieac37f755d436a2d45e81826de64a59eebb22639
2019-07-25 03:15:29 +00:00
Peiyong Lin
d598cc1252 Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 546b4220c5 am: 422c394799
am: b6aae19d34

Change-Id: I0aa1865c887068da8b46d5922537a616b5a4f83b
2019-07-24 18:25:29 -07:00
Peiyong Lin
26b359dc23 Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 7c5bb0ecda am: 70605be5b7
am: c21a3d0a69

Change-Id: Iad37c38b9ca587a65ef1b498cc7a2d194c87ecb2
2019-07-24 18:20:17 -07:00
Peiyong Lin
3cd409d18b Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 7c5bb0ecda am: b2a496c416
am: be6bc9e6bf

Change-Id: Ib29601d5a130f483cd6ff580532bf8defc1e0bf3
2019-07-24 18:10:56 -07:00
Peiyong Lin
b6aae19d34 Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 546b4220c5
am: 422c394799

Change-Id: Ife605e2716278726aba076b6bb5d93b29e5bb7ca
2019-07-24 17:45:47 -07:00
Peiyong Lin
c21a3d0a69 Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 7c5bb0ecda
am: 70605be5b7

Change-Id: I32d55cdf9200a8910bd8bb8fa893faf905beffe8
2019-07-24 17:38:32 -07:00
Peiyong Lin
be6bc9e6bf Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 7c5bb0ecda
am: b2a496c416

Change-Id: I113e3d30ae96087328d7112a7aa2967ed392475a
2019-07-24 17:37:36 -07:00
Peiyong Lin
422c394799 Remove prerelease driver option from Settings UI. am: c2dfba01ca
am: 546b4220c5

Change-Id: I74a7f4cbea9d0ea015cc6b69b8dfa304ed82e6db
2019-07-24 17:26:08 -07:00
Peiyong Lin
70605be5b7 Remove prerelease driver option from Settings UI. am: c2dfba01ca
am: 7c5bb0ecda

Change-Id: I17a752824ea403089efdf971aec87361aaacad39
2019-07-24 17:25:16 -07:00
Peiyong Lin
b2a496c416 Remove prerelease driver option from Settings UI. am: c2dfba01ca
am: 7c5bb0ecda

Change-Id: Icfe7daa49feffd7b46b887d41e34615c8c0df6f9
2019-07-24 17:25:14 -07:00
Peiyong Lin
939c15f8b0 Remove prerelease driver option from Settings UI. am: c2dfba01ca
am: 7c5bb0ecda

Change-Id: I96f5c0d30d3ae954571fcaa5f43848fed8cd2e63
2019-07-24 17:24:54 -07:00
Peiyong Lin
546b4220c5 Remove prerelease driver option from Settings UI.
am: c2dfba01ca

Change-Id: Id48683555b1bdfc3dbc3a238c987f114ff029cc5
2019-07-24 16:59:33 -07:00
Peiyong Lin
7c5bb0ecda Remove prerelease driver option from Settings UI.
am: c2dfba01ca

Change-Id: Ia0f23e48d9ed4ad10d01bebe23d4b8cdd62458c3
2019-07-24 16:59:33 -07:00
Quang Luong
e6cb73451c Merge "Added WifiSettings -> WifiSettings2 redirection behind feature flag" 2019-07-24 21:59:02 +00:00
Raff Tsai
0d5f5b1615 Merge "Fix crash after uninstalling app am: 637d419157 am: cef4f97569" into qt-qpr1-dev-plus-aosp
am: b6ee6e287d

Change-Id: I0b4efe95090507c82571bfb39cd17eb6e5280db5
2019-07-24 05:39:19 -07:00
Raff Tsai
312e287bb8 Fix crash after uninstalling app am: 637d419157 am: 87dbb3c42c
am: e097aabbf9

Change-Id: I4be4a28353ccbe4f4a0ef6e815a01398c0c69342
2019-07-24 05:38:43 -07:00