Commit Graph

53180 Commits

Author SHA1 Message Date
Treehugger Robot
b3f8696c4d Merge "Remove use of deprecated Time class" 2019-09-17 16:32:47 +00:00
Neil Fuller
4c77d00e34 Remove use of deprecated Time class
Remove a use of the deprecated Time class.

Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
2019-09-17 13:53:17 +01:00
Xin Li
d7a8e234e9 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:18 +00:00
Xin Li
7195e05dfa DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
2019-09-04 13:34:43 -07:00
Xin Li
bd8030e8b2 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
2019-08-23 06:45:17 +00:00
Xin Li
f92905cfe9 DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
Bug: 139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9
2019-08-23 06:42:10 +00:00
Xin Li
b03fdd4dcf [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am: 1e53efc4c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I1898ca933b111068bd8b7eafbe5421096c313d9e
2019-08-15 00:25:54 -07:00
Xin Li
f8c25b6ac4 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am: c3ef16882d -s ours
am skip reason: subject contains skip directive

Change-Id: I1d1b46e30a9ec5b4e01f351342fe45ac64994d47
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
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
b377a593b7 Merge "Allow radio info on phones with no subscription"
am: 19d1f890a0

Change-Id: Ia63778cf83212b2670413e2567c068bf92f6ff05
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
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
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
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
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
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
android-build-team Robot
6d7f8afe65 Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886, 8558887, 8558888, 8558889, 8558071, 8558072, 8556231] into qt-release
Change-Id: Id07c91777f0b9ff3283ff1dfc53b5e1680c5f2f0
2019-07-12 04:11:18 +00:00
Antony Sargent
8d2baf64c7 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
(cherry picked from commit 5f612a4b44)
2019-07-12 04:10:26 +00:00
android-build-team Robot
58949a7d72 Merge cherrypicks of [8549820, 8549668, 8549613, 8549614, 8549935, 8549808, 8549876, 8549809, 8549552] into qt-release
Change-Id: I9d4e0032c124831e73c042f5b7e263a6ab7fb740
2019-07-11 19:50:24 +00:00
tmfang
58dcca9844 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 19:50:02 +00:00
Xin Li
ba73db3e92 [automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
am: 0c7e805902 -s ours
am skip reason: subject contains skip directive

Change-Id: I724db7670844b89aaae1e9bc856c16c95209b14e
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
android-build-team Robot
d3bf6f0acb Snap for 5716396 from 13d6e13166 to qt-release
Change-Id: Ib07c520516900525ecd18f1f04c657bcc7ce06e6
2019-07-10 03:42:19 +00: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
29cd1a9fea Snap for 5713174 from 292e7ad110 to qt-release
Change-Id: Ie17a2f13b775ea666400306afee8d12cdf9dec5c
2019-07-09 02:57:17 +00: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 -s ours
am skip reason: subject contains skip directive

Change-Id: I10718d202f97e6fb1d6c7855c50ae5e15d4e5278
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
android-build-team Robot
5868d85608 Snap for 5706892 from a0fb9000bb to qt-release
Change-Id: If19f709d9b070496081c3ea25ab531c6bff9f6ea
2019-07-04 02:58:25 +00:00
Bill Yi
479df9b529 [automerger skipped] Import translations. DO NOT MERGE
am: a0fb9000bb -s ours
am skip reason: subject contains skip directive

Change-Id: I53bbafb3bcf25c01d4b1bc45edb66398ca900e91
2019-07-03 16:19:58 -07:00
Bill Yi
a0fb9000bb Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
2019-07-02 23:30:20 -07:00
Neil Fuller
bf673318f1 Merge "Add tobiast@ to the OWNERS file" am: a931693721
am: 46e53e770c

Change-Id: I9229928c7e9895003869752df1602ed26b42b90e
2019-07-02 15:32:40 -07:00
Neil Fuller
46e53e770c Merge "Add tobiast@ to the OWNERS file"
am: a931693721

Change-Id: Id52f2dcd3755f4fbbd6f6918e993063aebc582ac
2019-07-02 10:13:36 -07:00
Xin Li
59b1a2f6bb [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 0a68e9bfe7 -s ours
am skip reason: subject contains skip directive

Change-Id: I075c4d89765d09a570e0150e486e85dc78772afc
2019-07-02 10:04:54 -07:00
Neil Fuller
a931693721 Merge "Add tobiast@ to the OWNERS file" 2019-07-02 14:27:55 +00:00
Neil Fuller
ca6542843c Add tobiast@ to the OWNERS file
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.

Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
2019-07-02 10:55:50 +01:00
android-build-team Robot
64b912c151 Snap for 5702458 from 26a2694bd3 to qt-release
Change-Id: Ifeae76d0bea60dca5dcfb29ff8358e2ca04511f0
2019-07-02 04:30:03 +00:00
Xin Li
0a68e9bfe7 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I298dd1232c7e304b5d2cd9fda59006d08026698a
2019-07-01 21:00:04 +00:00
Bill Yi
d1bdb4f72d [automerger skipped] Import translations. DO NOT MERGE
am: 26a2694bd3 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c83a096d556894ace12a767de72ba62f6f3f587
2019-07-01 02:42:17 -07:00
Bill Yi
26a2694bd3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0
2019-06-30 14:58:27 -07:00
android-build-team Robot
0ab6fbdb8f Snap for 5698743 from 72aded338a to qt-release
Change-Id: I7b33e1bba4dcfcd626adbc27eb40d4fc95e3af6b
2019-06-29 23:05:08 +00:00