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
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
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
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
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
Peiyong Lin
d598cc1252
Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 546b4220c5 am: 422c394799
...
am: b6aae19d34
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
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
2019-07-24 18:10:56 -07:00
Peiyong Lin
b6aae19d34
Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 546b4220c5
...
am: 422c394799
2019-07-24 17:45:47 -07:00
Peiyong Lin
c21a3d0a69
Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 7c5bb0ecda
...
am: 70605be5b7
2019-07-24 17:38:32 -07:00
Peiyong Lin
be6bc9e6bf
Remove prerelease driver option from Settings UI. am: c2dfba01ca am: 7c5bb0ecda
...
am: b2a496c416
2019-07-24 17:37:36 -07:00
Peiyong Lin
422c394799
Remove prerelease driver option from Settings UI. am: c2dfba01ca
...
am: 546b4220c5
2019-07-24 17:26:08 -07:00
Peiyong Lin
70605be5b7
Remove prerelease driver option from Settings UI. am: c2dfba01ca
...
am: 7c5bb0ecda
2019-07-24 17:25:16 -07:00
Peiyong Lin
b2a496c416
Remove prerelease driver option from Settings UI. am: c2dfba01ca
...
am: 7c5bb0ecda
2019-07-24 17:25:14 -07:00
Peiyong Lin
546b4220c5
Remove prerelease driver option from Settings UI.
...
am: c2dfba01ca
2019-07-24 16:59:33 -07:00
Peiyong Lin
7c5bb0ecda
Remove prerelease driver option from Settings UI.
...
am: c2dfba01ca
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
2019-07-24 05:39:19 -07:00
Raff Tsai
312e287bb8
Fix crash after uninstalling app am: 637d419157 am: 87dbb3c42c
...
am: e097aabbf9
2019-07-24 05:38:43 -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
2019-07-24 05:29:41 -07:00
Raff Tsai
e097aabbf9
Fix crash after uninstalling app am: 637d419157
...
am: 87dbb3c42c
2019-07-24 05:29:40 -07:00
Raff Tsai
87dbb3c42c
Fix crash after uninstalling app
...
am: 637d419157
2019-07-24 05:20:42 -07:00
Raff Tsai
cef4f97569
Fix crash after uninstalling app
...
am: 637d419157
2019-07-24 05:20:40 -07:00
TreeHugger Robot
9a6dbf60c1
Merge "Put newly discovered devices to the bottom of the list"
2019-07-24 10:36:01 +00: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
hughchen
14e0fe2707
Put newly discovered devices to the bottom of the list
...
Add two type SortType.TYPE_DEFAULT and SortType.TYPE_FIFO in BluetoothDevicePreference.
It needs to decide the sort type when you create the BluetoothDevicePreference.
TYPE_DEFAULT - According to the CacheBluetoothDevice state to sort
TYPE_FIFO - According to the timestamp to sort
Bug: 112546918
Test: make -j42 RunSettingsRoboTests
Change-Id: Icd25d9b76a44d5a105f8daf64e5bc1f9ead8cd92
2019-07-24 15:27:17 +08:00
Joshua Mccloskey
6c4c542fba
Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979 am: 7e1e537e76
...
am: 2d4df16487
2019-07-23 23:34:37 -07:00
Joshua Mccloskey
cbdfe9403e
Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979 am: 436155ba91
...
am: f742e78e6f
2019-07-23 23:15:57 -07:00
Joshua Mccloskey
2d4df16487
Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979
...
am: 7e1e537e76
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
2019-07-23 22:14:08 -07:00
Lucas Lin
4eb82f912a
Merge "Create a string for private DNS "On"" am: a64f8d9521 am: 903e8dac6c am: c30cdecfba am: e5cc01c3dc
...
am: 32bdab6035
2019-07-23 22:12:09 -07:00
Lucas Lin
32bdab6035
Merge "Create a string for private DNS "On"" am: a64f8d9521 am: 903e8dac6c am: c30cdecfba
...
am: e5cc01c3dc
2019-07-23 21:50:27 -07:00
Joshua Mccloskey
7e1e537e76
Merge "Add extra check for accessibility flow." into qt-r1-dev
...
am: c563fbb979
2019-07-23 21:49:40 -07:00
Joshua Mccloskey
436155ba91
Merge "Add extra check for accessibility flow." into qt-r1-dev
...
am: c563fbb979
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
2019-07-23 21:10:21 -07:00
Lucas Lin
c30cdecfba
Merge "Create a string for private DNS "On"" am: a64f8d9521
...
am: 903e8dac6c
2019-07-23 20:56:43 -07:00
Lucas Lin
903e8dac6c
Merge "Create a string for private DNS "On""
...
am: a64f8d9521
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
Joshua Mccloskey
c563fbb979
Merge "Add extra check for accessibility flow." into qt-r1-dev
2019-07-23 23:54:38 +00:00
TreeHugger Robot
de70e24f47
Merge "Pass context for Starred Contacts Summary"
2019-07-23 23:54:04 +00:00
