Xin Li
e66eb255ee
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours
...
am: b03fdd4dcf
2019-08-15 00:40:41 -07:00
Xin Li
b03fdd4dcf
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
...
am: 1e53efc4c4
2019-08-15 00:25:54 -07:00
Xin Li
f62f61cbfb
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours
...
am: f8c25b6ac4
2019-08-14 23:52:30 -07:00
Xin Li
f8c25b6ac4
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
am: c3ef16882d
2019-08-14 23:32:21 -07:00
Treehugger Robot
1e53efc4c4
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Xin Li
8cabf84832
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
am: 9821df1b1f
2019-08-14 13:32:06 -07:00
Xin Li
9821df1b1f
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: I80e9ac9e5e6a21ebd94543865b8f75c20020360d
2019-08-14 11:35:21 -07:00
Jordan Liu
1fc63fc444
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
...
am: b377a593b7
2019-08-13 18:48:49 -07:00
Jordan Liu
b377a593b7
Merge "Allow radio info on phones with no subscription"
...
am: 19d1f890a0
2019-08-13 18:37:15 -07:00
Jordan Liu
19d1f890a0
Merge "Allow radio info on phones with no subscription"
2019-08-14 00:22:42 +00:00
Xin Li
c3ef16882d
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
2019-08-13 16:36:39 -07:00
android-build-team Robot
573db8a758
Snap for 5674421 from 4a949c0640 to pi-platform-release
...
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
2019-08-13 16:25:08 +00:00
Jordan Liu
655c1be579
Allow radio info on phones with no subscription
...
Some info is still helpful for debugging in these cases.
Bug: 139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
2019-08-12 19:02:27 +00:00
Bill Yi
e5dd9176ca
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9af3e6a625
2019-07-30 11:34:43 -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
Kevin Chyn
1c1191b640
Do not request cancel authentication unless currently authenticating
...
am: 49c7d07650
2019-07-26 17:48:44 -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
Peiyong Lin
546b4220c5
Remove prerelease driver option from Settings UI.
...
am: c2dfba01ca
2019-07-24 16:59:33 -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
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
Yanting Yang
920f6109a8
Merge "Support new regulatory label for location" into qt-dev
...
am: 28736bee5d
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
Bill Yi
57b150fedd
[automerger skipped] Import translations. DO NOT MERGE
...
am: 7d966975ad
2019-07-22 12:51:28 -07:00
Bill Yi
7d966975ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0369197f24082cadfbb6b3ac72d33243231090ac
2019-07-22 10:59:39 -07:00
Yanting Yang
49b1bc1545
Support new regulatory label for location
...
Fixes: 137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
2019-07-20 02:07:54 +08:00
Bill Yi
ad2542c534
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
2019-07-18 14:24:36 -07:00
Bill Yi
e73e59c562
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Idb389ab591b291cae86749badc8d7cef2052e388
2019-07-18 11:28:21 -07:00
Bill Yi
7903044b2b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8d229d7090
2019-07-15 01:21:16 -07:00
Bill Yi
8d229d7090
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ecaff62cfd0370a1ff7e5f6eb36a871c8486dee
2019-07-14 22:26:37 -07:00
Andrew Sapperstein
8c6b2bafb0
Merge "Fix erasing of eSIMs for some devices" into qt-dev
...
am: 1f942d9857
2019-07-11 20:51:33 -07:00
Andrew Sapperstein
1f942d9857
Merge "Fix erasing of eSIMs for some devices" into qt-dev
2019-07-12 03:13:39 +00:00
Antony Sargent
5f612a4b44
Fix erasing of eSIMs for some devices
...
Doing a factory data reset used to always erase eSIMs. Then a few months
ago we added a default-on checkbox to let users opt out of erasing the
eSIM during this process, but only had it show for some devices (ones
which support the "fastboot oem esim_erase" command) by adding a system
property named masterclear.allow_retain_esim_profiles_after_fdr.
When recently updating the strings shown in the factory data reset
screen and the confirmation dialog, we changed the code so that if that
the checkbox is hidden we'll pass false for the ERASE_ESIMS_EXTRA
parameter sent to the factory data reset confirmation dialog. This had
the unintended side effect of making devices that don't specify true for
masterclear.allow_retain_esim_profiles_after_fdr skip erasing the eSIM.
This CL fixes that by removing the "is the checkbox hidden" check, going
back to the previous behavior of just using the checkbox value, which is
on by default even if hidden.
Fixes: 135284765
Test: make RunSettingsRoboTests
Change-Id: Ia9f335920e4e3c4a90f0a6a49d1722a0c19ea83d
2019-07-11 20:23:58 +00:00
Bill Yi
1da3bf10bf
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 433e625341
2019-07-11 03:10:27 -07:00
TreeHugger Robot
433e625341
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-07-11 09:54:20 +00:00
tmfang
edd86364f5
Improve Settings launch performance
...
am: 496d3f6f9c
2019-07-11 00:54:14 -07:00
tmfang
496d3f6f9c
Improve Settings launch performance
...
From traces analysis, we found getFreeBytes
was taking a long time to return.
getFreeBytes was used when storage controller
tried to get storage information.
In order to prevent this case, we put the action
which takes too much time in background thread.
Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes: 136268875
Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
(cherry picked from commit 0c37f019f6
2019-07-11 04:19:42 +00:00
Bill Yi
f74a94db37
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I09ed37fffcf0bbcf61cdfa0b1f8cf22f5828d23b
2019-07-10 19:31:11 -07:00
Xin Li
3bf8c80dd5
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master" am: 0c7e805902 -s ours
...
am: ba73db3e92
2019-07-10 19:02:51 -07:00
Xin Li
ba73db3e92
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
...
am: 0c7e805902
2019-07-10 18:44:45 -07:00
Treehugger Robot
0c7e805902
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
2019-07-11 00:56:33 +00:00
Bill Yi
6edf1646c1
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13d6e13166
2019-07-09 17:17:49 -07:00
Xin Li
f03ae69f69
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
...
Bug: 136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59
2019-07-09 15:31:44 -07:00
Bill Yi
13d6e13166
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925
2019-07-09 11:46:23 -07:00
android-build-team Robot
ec58694ae8
Snap for 5622519 from fd365ae91e to pi-platform-release
...
Change-Id: I4b218750d55b6dbb691814f72ed880fc5d1677fb
2019-07-08 23:29:58 +00:00
Bill Yi
2759932e72
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
2019-07-05 19:04:54 -07:00
Bill Yi
292e7ad110
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
2019-07-05 14:38:28 -07:00
Bill Yi
479df9b529
[automerger skipped] Import translations. DO NOT MERGE
...
am: a0fb9000bb
2019-07-03 16:19:58 -07:00
