Commit Graph

53801 Commits

Author SHA1 Message Date
Kevin Chyn
adb95d23b2 [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours am: 587d8d7005 -s ours
am: 32a9b548e3 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: Iebd57656a9456105f13a8d9de44ded0a4f1e29df
2019-07-26 18:28:17 -07:00
Android Build Merger (Role)
c7c8efed8a Merge "Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97 am: 10fe104f06" into qt-qpr1-dev-plus-aosp 2019-07-27 01:27:23 +00:00
Kevin Chyn
c68f9576c9 Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97
am: 10fe104f06

Change-Id: I55dac777f7f8abf0b5a41a4e8bc02868130fea51
2019-07-26 18:27:03 -07:00
Kevin Chyn
bdebaf4396 Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97
am: 7baab69bdc

Change-Id: I46b98ccd554566433c1d11272677894960fd2d16
2019-07-26 18:26:47 -07:00
Kevin Chyn
890b5c416d [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 am: 1c1191b640 -s ours
am: c919df9edb -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I11ceedfa9003dd22ef6dcd23ad618241f9925aec
2019-07-26 18:25:30 -07:00
Kevin Chyn
32a9b548e3 [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours
am: 587d8d7005 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I14cf7941c761c973d6c9297d366c213aeae4cbcf
2019-07-26 18:15:41 -07:00
Kevin Chyn
9f395fd0a9 [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours
am: 587d8d7005 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I2ed1d97f1fa5104e1c381babc2625cb69b147b6c
2019-07-26 18:14:54 -07:00
Kevin Chyn
7baab69bdc Add ability to finish() ConfirmDeviceCredential if it loses foreground
am: e27a304b97

Change-Id: Ie695769418adfd316d608a2e23ed45e7237d28ce
2019-07-26 18:14:19 -07:00
Kevin Chyn
10fe104f06 Add ability to finish() ConfirmDeviceCredential if it loses foreground
am: e27a304b97

Change-Id: Idcc2dab10c42016f0f440cbf495974bf3ee1ba94
2019-07-26 18:13:32 -07:00
Kevin Chyn
c919df9edb [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650
am: 1c1191b640 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I662181a2cfd7b05c9929b868e2b76895f407678c
2019-07-26 18:09:34 -07:00
Kevin Chyn
587d8d7005 [automerger skipped] Do not request cancel authentication unless currently authenticating
am: 49c7d07650 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: If5e6d4c715b0c3482f297c709320e2ca9f6fa209
2019-07-26 17:50:13 -07:00
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
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
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
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
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
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
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
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
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
Android Build Merger (Role)
b6ee6e287d Merge "Fix crash after uninstalling app am: 637d419157 am: cef4f97569" into qt-qpr1-dev-plus-aosp 2019-07-24 12:29:57 +00:00
Raff Tsai
03572035af Fix crash after uninstalling app am: 637d419157
am: cef4f97569

Change-Id: Iaf2fe83efcd510962c71e757cad83f7e8f9e0943
2019-07-24 05:29:41 -07:00
Raff Tsai
e097aabbf9 Fix crash after uninstalling app am: 637d419157
am: 87dbb3c42c

Change-Id: I64e40aa595bdd9fe4a8870b28533dd22438d7a23
2019-07-24 05:29:40 -07:00
Raff Tsai
87dbb3c42c Fix crash after uninstalling app
am: 637d419157

Change-Id: I48bf6ceb772fb5ebd1f6ebf8cff12ea664f963c5
2019-07-24 05:20:42 -07:00
Raff Tsai
cef4f97569 Fix crash after uninstalling app
am: 637d419157

Change-Id: Ib68843298dfcb71de6198a988f153397aabeb7f3
2019-07-24 05:20:40 -07:00
Raff Tsai
637d419157 Fix crash after uninstalling app
updateState was invoked in loader callback. But the
package was uninstalled at the callback time caused
null pointer exception. Add null check to prevent
null pointer access.

Fixes: 136170218
Fixes: 133771724
Test: make RunSettingsRoboTests, manual
Change-Id: I2715e77f6e32af42a4bce70c9f409b0311eb36c4
(cherry picked from commit 790a822526)
2019-07-24 08:36:13 +00:00
Joshua Mccloskey
2d4df16487 Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979
am: 7e1e537e76

Change-Id: I55a341a94cad27275457ab3a36116a8f788e83a2
2019-07-23 22:15:21 -07:00
Joshua Mccloskey
f742e78e6f Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979
am: 436155ba91

Change-Id: I4bdca0d0fe0cd5f38863eeb6975d026c424e6799
2019-07-23 22:14:08 -07:00
Lucas Lin
32bdab6035 Merge "Create a string for private DNS "On"" am: a64f8d9521 am: 903e8dac6c am: c30cdecfba
am: e5cc01c3dc

Change-Id: Id15fc912e2d31b84c0a8ff5f28a92f11362f4056
2019-07-23 21:50:27 -07:00
Joshua Mccloskey
7e1e537e76 Merge "Add extra check for accessibility flow." into qt-r1-dev
am: c563fbb979

Change-Id: I0d84937b8029a8bdcec920123501fcb81f99f02f
2019-07-23 21:49:40 -07:00