Commit Graph

54250 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Raff Tsai
87dbb3c42c Fix crash after uninstalling app
am: 637d419157

Change-Id: I48bf6ceb772fb5ebd1f6ebf8cff12ea664f963c5
2019-07-24 05:20:42 -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
436155ba91 Merge "Add extra check for accessibility flow." into qt-r1-dev
am: c563fbb979

Change-Id: Ib0edf21c01d3e2086f61b80079e9efe5c2b231aa
2019-07-23 21:13:01 -07:00
Lucas Lin
e5cc01c3dc Merge "Create a string for private DNS "On"" am: a64f8d9521 am: 903e8dac6c
am: c30cdecfba

Change-Id: I0384e4169df9a0efa423a0f2bae783ee5212e5b8
2019-07-23 21:10:21 -07:00
Lucas Lin
c30cdecfba Merge "Create a string for private DNS "On"" am: a64f8d9521
am: 903e8dac6c

Change-Id: Id364ce04a54afe3abe8e9b240a6a6ed9864d5681
2019-07-23 20:56:43 -07:00
Lucas Lin
903e8dac6c Merge "Create a string for private DNS "On""
am: a64f8d9521

Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b
2019-07-23 20:45:49 -07:00
Lucas Lin
a64f8d9521 Merge "Create a string for private DNS "On"" 2019-07-24 03:15:01 +00:00
android-build-team Robot
191e668268 Snap for 5749990 from c563fbb979 to qt-c2f2-release
Change-Id: Ic7a91c902b76d49f37919d33d33e7097a7880177
2019-07-24 03:00:31 +00:00
android-build-team Robot
c6d413daec Merge cherrypicks of [8738218, 8738219, 8738140, 8736270, 8736271, 8736272, 8732114, 8738495, 8738319, 8736743, 8738320, 8738496] into qt-release
Change-Id: I64ad4e8161a96e4cc2e28ad24bd988894892910c
2019-07-24 02:22:47 +00:00
Yanting Yang
ad27235404 Support new regulatory label for location
Fixes: 137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
(cherry picked from commit 49b1bc1545)
2019-07-24 02:22:16 +00:00
Joshua Mccloskey
c563fbb979 Merge "Add extra check for accessibility flow." into qt-r1-dev 2019-07-23 23:54:38 +00:00
Bill Yi
7edf8eb90e [automerger skipped] Import translations. DO NOT MERGE
am: fe36dd6834 -s ours
am skip reason: subject contains skip directive

Change-Id: I21a0fe6886a4232bcb526dc8ade1dde41a7d0b72
2019-07-23 15:17:31 -07:00
Peiyong Lin
c2dfba01ca Remove prerelease driver option from Settings UI.
BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
2019-07-23 21:18:10 +00:00
Bill Yi
fe36dd6834 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I81487d87626426a7b7a969314691a6ce1177df4b
2019-07-23 13:19:18 -07:00
joshmccloskey
fae3193539 Add extra check for accessibility flow.
Bug: 138197084
Test: Verified other accessibility features like Live Transcribe does
not bring the user to the accessibility flow.
Test: Verified that the Sound Amplifier does not bring the user to
the accessibility flow.

Change-Id: I5131d74926c0b01c565da280c55afe0080855688
2019-07-23 19:13:08 +00:00
Android Build Merger (Role)
6a014082b6 Merge "Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d am: 920f6109a8" into qt-r1-dev-plus-aosp 2019-07-23 16:47:17 +00:00
Yanting Yang
468e40e97c Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
am: c453af3f91

Change-Id: Iba9e810217cc4eee6c791eda6e3c100a851e9aa5
2019-07-23 09:46:44 -07:00
Yanting Yang
ed31ca806c Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
am: 920f6109a8

Change-Id: I22c607437953b5f87fa30d5f53715535ab2e363c
2019-07-23 09:46:43 -07:00
Yanting Yang
920f6109a8 Merge "Support new regulatory label for location" into qt-dev
am: 28736bee5d

Change-Id: I2a2fb86c5062f38b52ac38366c619aa8e0bb2f00
2019-07-23 09:37:45 -07:00
Yanting Yang
c453af3f91 Merge "Support new regulatory label for location" into qt-dev
am: 28736bee5d

Change-Id: I0a966698855aa935b6acbf3829988d5004ff57e2
2019-07-23 09:37:45 -07:00
TreeHugger Robot
28736bee5d Merge "Support new regulatory label for location" into qt-dev 2019-07-23 16:12:52 +00:00
lucaslin
be8701bca5 Create a string for private DNS "On"
The last private DNS settings screen landed in P after string
freeze, which led us to reuse R.string.switch_on_text for the
"on" text when private DNS is active. That string comes from
notifications. Private DNS should have its own string for this
instead.

Bug: 79122154
Test: 1. Build pass
      2. make -j44 RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest

Change-Id: Ie013a858c8bc41e00a1b940d02efa2b605991685
2019-07-23 19:40:09 +08:00
Sunny Shao
f67401a4c3 Merge "Use the date format to show the system update info" into qt-r1-dev
am: a076039803

Change-Id: I12eab14b3a406348d13436df5843727f0dccf71d
2019-07-23 03:36:02 -07:00
TreeHugger Robot
a076039803 Merge "Use the date format to show the system update info" into qt-r1-dev 2019-07-23 10:07:36 +00:00
android-build-team Robot
eee76b33b7 Snap for 5746716 from 66b0cabf26 to qt-c2f2-release
Change-Id: I04433ff2076c1e2f2499b29793541c4a822a1c02
2019-07-23 03:09:51 +00:00
Quang Luong
f73d65c940 Default MAC address should display "Not Available" in network details
For saved networks that do not have a MAC address available in their
WifiConfiguration such as Passpoint networks, the MAC address will
be the default value of 20:00:00:00:00:00. In this case, display
"Not Available" as the summary of the MAC address preference.

Bug: 137282522
Test: atest WifiDetailPreferenceControllerTest &&
manual - open saved passpoint network details while disconnected
but in range and observe MAC address preference.

Change-Id: Ie9010b0430726de8105852ae2afe10047dcc3676
2019-07-22 17:06:51 -07:00
Mehdi Alizadeh
418f942c0e Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
am: 66b0cabf26

Change-Id: I6ea0fe769b52345b8f148547d7950af9203c9926
2019-07-22 16:52:52 -07:00
Mehdi Alizadeh
66b0cabf26 Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev 2019-07-22 23:17:48 +00:00
Android Build Merger (Role)
be17e5a4e6 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad -s ours am: 6e57d54d35 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-22 20:12:47 +00:00