Commit Graph

53070 Commits

Author SHA1 Message Date
Bill Yi
1b86d59384 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 67afe87617 -s ours
am skip reason: subject contains skip directive

Change-Id: I253e0acc117f894554878c91ba084cca775eb7bd
2019-07-30 15:42:25 -07:00
TreeHugger Robot
66208e734b Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev 2019-07-30 22:33:32 +00:00
TreeHugger Robot
67afe87617 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-30 21:39:43 +00:00
TreeHugger Robot
64d8aedc04 Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-07-30 19:32:23 +00:00
Antony Sargent
6d910e8608 Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-07-30 12:30:19 -07:00
Bill Yi
20d501562e [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours
am: 3cda841897 -s ours
am skip reason: subject contains skip directive

Change-Id: I8670a31858f74816775f9ca91e799e08719d7284
2019-07-30 12:03:57 -07:00
Bill Yi
0501bbb97f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id8561f757b8520ebbd976cc9b06fa833b68575d8
2019-07-30 11:55:38 -07:00
Bill Yi
3cda841897 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours
am: f5c8056f7a -s ours
am skip reason: subject contains skip directive

Change-Id: I8d700ef074dff397a3e02cca8945935a549c77df
2019-07-30 11:47:09 -07:00
Bill Yi
7e31de784c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours
am: 50dc17d8bc -s ours
am skip reason: subject contains skip directive

Change-Id: I594fbdb0e5eea0247dfa12fd5eff51677627e41c
2019-07-30 11:43:40 -07:00
Bill Yi
969175bc68 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours
am: f5c8056f7a -s ours
am skip reason: subject contains skip directive

Change-Id: I2c8ab98e3bddd57716190bc43bf71db2b62d0d05
2019-07-30 11:34:47 -07:00
Bill Yi
44046cc33c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: f63cb669ff -s ours
am skip reason: subject contains skip directive

Change-Id: If7d866dafc18cd4d97f613fcbfb59b062a11ba99
2019-07-30 11:33:38 -07:00
Bill Yi
50dc17d8bc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: f63cb669ff -s ours
am skip reason: subject contains skip directive

Change-Id: Ia87ca65aaf5bf3f43c2d15b944bdf06a74f857c6
2019-07-30 11:32:38 -07:00
Bill Yi
f5c8056f7a [automerger skipped] Import translations. DO NOT MERGE
am: 9af3e6a625 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic131b3c52fc5f2c0bd1b735a376df65108490f5e
2019-07-30 11:32:37 -07:00
TreeHugger Robot
f63cb669ff Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-30 18:09:15 +00:00
Antony Sargent
28f6c96822 Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d
am: 42861b21c9

Change-Id: I0f3fae2daf7c5df5985e2fd6597fdf563fdb095c
2019-07-30 10:28:26 -07:00
Antony Sargent
12a04d695e Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
am: 985d3d570d

Change-Id: If1eb34ad104dd55cf749bd2fabdca4fed16f93dc
2019-07-30 10:05:31 -07:00
Antony Sargent
42861b21c9 Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
am: 985d3d570d

Change-Id: Ic653102f8f66c0f5e1e3457750cdf150f1dbfd5e
2019-07-30 09:54:25 -07:00
TreeHugger Robot
985d3d570d Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev 2019-07-30 16:41:29 +00:00
android-build-team Robot
f18f847c07 Snap for 5764218 from 2d035ddfa2 to qt-qpr1-release
Change-Id: I4d7523be1864a6fbec7a5a0f8a91f50cfbd5dc0d
2019-07-30 03:07:52 +00:00
Bill Yi
88ba8eadff Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic7e4a4b15d2cbb88cc6c27c14fe41c1d0dd852fe
2019-07-29 17:32:38 -07:00
Bill Yi
f2e88c8cd7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie730f2fa36caf0c3d99159cc649ed7e24ca2ceec
2019-07-29 17:02:13 -07:00
Bill Yi
9af3e6a625 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idbe888a8bb4d386d7d8e883cc530561c1a5806ad
2019-07-29 16:46:49 -07:00
Julia Reynolds
cfe218cf43 Merge "Move channel listing into a pref controller" into qt-qpr1-dev
am: 2d035ddfa2

Change-Id: Ice7a48d0fdad00b8d1f09a1da1fe39d5a8d85e79
2019-07-29 13:23:00 -07:00
TreeHugger Robot
2d035ddfa2 Merge "Move channel listing into a pref controller" into qt-qpr1-dev 2019-07-29 18:42:25 +00:00
TreeHugger Robot
0805e3d641 Merge "Fix launching of work profile notif settings" into qt-qpr1-dev 2019-07-29 02:28:37 +00:00
android-build-team Robot
fc62bb0aa7 Snap for 5760827 from 3ed75c8478 to qt-qpr1-release
Change-Id: Ib69e8fa06f6274c6d7930d5fa12aae5a0e941a4f
2019-07-27 23:13:34 +00:00
Jason Chiu
3ed75c8478 Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
am: 04ad8c905a

Change-Id: I2c87041fb5575dfd621f4a9539653342c75d544f
2019-07-26 18:44:26 -07:00
Jason Chiu
8af4962f45 Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
am: 04ad8c905a

Change-Id: Ie53835eed1e681abb3425b00a838a826ec1af27d
2019-07-26 18:43:59 -07:00
TreeHugger Robot
04ad8c905a Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev 2019-07-27 01:29:55 +00: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
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
7ee528d1f5 [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: Ib429846849e68f0db15a50fff7df1e7403d3dfb3
2019-07-26 18:11:51 -07:00
Kevin Chyn
25f9f63969 Add ability to finish() ConfirmDeviceCredential if it loses foreground
am: e27a304b97

Change-Id: I4bca07e715a2d9a928fee0da7109b51a9c6eb6b2
2019-07-26 18:10:57 -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
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
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
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
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
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
android-build-team Robot
e93b284752 Snap for 5752705 from 637d419157 to qt-qpr1-release
Change-Id: Iaf462f6f7091c13a79400e5025af8f2c7fbfc8ec
2019-07-25 03:00:59 +00: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