Bill Yi
1b86d59384
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 67afe87617
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
d8700db7c7
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours
...
am: f72e0eeddd
2019-07-30 12:15:57 -07:00
Bill Yi
20d501562e
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours
...
am: 3cda841897
2019-07-30 12:03:57 -07:00
Bill Yi
d5352c93c8
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours
...
am: 3cda841897
2019-07-30 12:02:20 -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
f72e0eeddd
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours
...
am: f5c8056f7a
2019-07-30 11:53:10 -07:00
Bill Yi
3c98eeecd2
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: e5dd9176ca -s ours
...
am: 88c1e9ff62
2019-07-30 11:49:41 -07:00
Bill Yi
3cda841897
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours
...
am: f5c8056f7a
2019-07-30 11:47:09 -07:00
Bill Yi
004b9882e7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours
...
am: 1e7de9c312
2019-07-30 11:46:46 -07:00
Bill Yi
25bfe44ee6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours
...
am: 50dc17d8bc
2019-07-30 11:43:42 -07:00
Bill Yi
88c1e9ff62
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours
...
am: e5dd9176ca
2019-07-30 11:43:41 -07:00
Bill Yi
7e31de784c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours
...
am: 50dc17d8bc
2019-07-30 11:43:40 -07:00
Bill Yi
969175bc68
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours
...
am: f5c8056f7a
2019-07-30 11:34:47 -07:00
Bill Yi
e5dd9176ca
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9af3e6a625
2019-07-30 11:34:43 -07:00
Bill Yi
44046cc33c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: f63cb669ff
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
2019-07-30 11:32:38 -07:00
Bill Yi
1e7de9c312
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: f63cb669ff
2019-07-30 11:32:38 -07:00
Bill Yi
f5c8056f7a
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9af3e6a625
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
2019-07-30 10:28:26 -07:00
Antony Sargent
c440f3e823
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d
...
am: 20c9eff53e
2019-07-30 10:17:13 -07:00
Antony Sargent
01028402ca
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d
...
am: 42861b21c9
2019-07-30 10:15:54 -07:00
Antony Sargent
12a04d695e
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
...
am: 985d3d570d
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
2019-07-30 09:54:25 -07:00
Antony Sargent
20c9eff53e
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev
...
am: 985d3d570d
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
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
104bc8e133
Merge "Move channel listing into a pref controller" into qt-qpr1-dev
...
am: 2d035ddfa2
2019-07-29 13:24:07 -07:00
Julia Reynolds
cfe218cf43
Merge "Move channel listing into a pref controller" into qt-qpr1-dev
...
am: 2d035ddfa2
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
Julia Reynolds
f2c967c225
Merge "Fix launching of work profile notif settings" into qt-qpr1-dev
...
am: 0805e3d641
2019-07-28 20:21:51 -07: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
19ffddb811
Merge cherrypicks of [9007561, 9007562, 9007563, 9007600, 9007801, 9007895, 9007389] into qt-release
...
Change-Id: Ib68db973c7a9b5875ecd65bcb683793978020065
2019-07-28 22:26:53 +00:00
Kevin Chyn
adef4840f3
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
(cherry picked from commit 49c7d07650
2019-07-28 22:26:26 +00:00
android-build-team Robot
34e21e206a
Snap for 5761090 from 04ad8c905a to qt-c2f2-release
...
Change-Id: I7d4bee917ccbbc7b6ca9a4a0471a03a9f874778b
2019-07-27 23:09:10 +00:00
Android Build Merger (Role)
14dfab3981
Merge "Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c905a am: 3ed75c8478" into qt-qpr1-dev-plus-aosp
2019-07-27 01:55:47 +00:00
Jason Chiu
8585fd6c85
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c905a
...
am: 3ed75c8478
2019-07-26 18:55:07 -07:00
Jason Chiu
409e4bc475
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c905a
...
am: f7423fd7ac
2019-07-26 18:55:05 -07:00
Jason Chiu
f7423fd7ac
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
...
am: 04ad8c905a
2019-07-26 18:45:07 -07:00
Jason Chiu
3ed75c8478
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
...
am: 04ad8c905a
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
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
Android Build Merger (Role)
dc0a2a6100
Merge "[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours am: 587d8d7005 -s ours am: 9f395fd0a9 -s ours am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history" into qt-qpr1-dev-plus-aosp
2019-07-27 01:28:45 +00:00
Kevin Chyn
b8d792d59c
[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours am: 587d8d7005 -s ours
...
am: 9f395fd0a90a33d62a17
2019-07-26 18:28:30 -07:00
