Commit Graph

55088 Commits

Author SHA1 Message Date
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
Andrew Sapperstein
6971e3d4cc Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857
am: 44f731c1c7

Change-Id: I5f6f9c95d0495c09f3514e7356ed7409ffd9eb7e
2019-07-11 20:59:39 -07:00
Andrew Sapperstein
8c6b2bafb0 Merge "Fix erasing of eSIMs for some devices" into qt-dev
am: 1f942d9857

Change-Id: I04bc60ed040546a64ea157840b76d815169d32a3
2019-07-11 20:51:33 -07:00
Andrew Sapperstein
44f731c1c7 Merge "Fix erasing of eSIMs for some devices" into qt-dev
am: 1f942d9857

Change-Id: I44e11b7a63c329883b01dc03f820e807c15953cf
2019-07-11 20:51:32 -07:00
Andrew Sapperstein
1f942d9857 Merge "Fix erasing of eSIMs for some devices" into qt-dev 2019-07-12 03:13:39 +00:00
android-build-team Robot
bd7ec984d2 Merge cherrypicks of [8551866, 8551867, 8551868, 8552336, 8552337, 8552338, 8551869, 8552339, 8552376, 8551887] into qt-c2f2-release
Change-Id: I32d4a9bd37c3ca77d5f40d0baf2f5eaf19742782
2019-07-12 00:13:17 +00:00
joshmccloskey
0f01190638 Ensure feature is supported and enabled.
Fixes: 137285390
Test: Verified that SecuritySettings no longer crashes.
Test: Verified that this PrefenceController no longer shows up
if the device does not support it.
Test: Verified that this PreferenceController no longer
shows up when the work profile is disabled.

Change-Id: I10f015e18491b203db6f942f07034d55f620cfe5
(cherry picked from commit a96a84e256)
2019-07-12 00:12:54 +00:00
joshmccloskey
00c05fc246 Ensure feature is supported and enabled.
am: a96a84e256

Change-Id: I5a1870ed55326fb9e8a5616ffa279bccc42b04ff
2019-07-11 14:56:10 -07:00
joshmccloskey
5c571b8896 Ensure feature is supported and enabled.
am: a96a84e256

Change-Id: Ie607b615a64665c91cccffc50901c8099c0413ca
2019-07-11 14:56:08 -07:00
joshmccloskey
a96a84e256 Ensure feature is supported and enabled.
Fixes: 137285390
Test: Verified that SecuritySettings no longer crashes.
Test: Verified that this PrefenceController no longer shows up
if the device does not support it.
Test: Verified that this PreferenceController no longer
shows up when the work profile is disabled.

Change-Id: I10f015e18491b203db6f942f07034d55f620cfe5
2019-07-11 21:31:31 +00:00
joshmccloskey
5dbcfc9d27 Update FaceSlice to use correct pref & FaceManager
am: 365beaebdb

Change-Id: I3762f68d4f16ad529ad7a1cc56891812daad7016
2019-07-11 14:08:02 -07:00
joshmccloskey
cab111d8a5 Update FaceSlice to use correct pref & FaceManager
am: 365beaebdb

Change-Id: If26b32c83bfbda5f6268985c4d8812ff25d76e05
2019-07-11 14:05:56 -07: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
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
joshmccloskey
365beaebdb Update FaceSlice to use correct pref & FaceManager
Fixes: 137137134
Test: Manual.
Change-Id: Idc707a7d2009975f81902867e4c37a8ee5775700
2019-07-11 16:28:21 +00:00
Android Build Merger (Role)
f6311a88da Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours am: 3e9da03d0c -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-11 10:16:49 +00:00
Bill Yi
4df6694c6e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 3e9da03d0c -s ours
am skip reason: subject contains skip directive

Change-Id: I59f8af945535b6aae8ab1a286816fdff2b0addbf
2019-07-11 03:16:28 -07:00
Bill Yi
a037c5b89e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 3e9da03d0c -s ours
am skip reason: subject contains skip directive

Change-Id: Iad91c18121a564cc1ef7a6f0b704c16a7fa37c06
2019-07-11 03:16:27 -07:00
Bill Yi
025db3d33e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 1da3bf10bf -s ours
am skip reason: subject contains skip directive

Change-Id: I1550a0d712b5b8853292e5f05ffda2b4d4a90bff
2019-07-11 03:16:27 -07:00
Bill Yi
3e9da03d0c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 433e625341 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5c4e1030a1f9907e3274be1a14c49d30783d839
2019-07-11 03:10:27 -07:00
Bill Yi
1da3bf10bf [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 433e625341 -s ours
am skip reason: subject contains skip directive

Change-Id: I22d56ba044543ee2389402ca28ae5ecf49b4a9cc
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
Android Build Merger (Role)
c2b7196945 Merge "Improve Settings launch performance am: 496d3f6f9c am: edd86364f5" into qt-r1-dev-plus-aosp 2019-07-11 08:12:38 +00:00
tmfang
6ed2484766 Improve Settings launch performance am: 496d3f6f9c
am: 49d575b91c

Change-Id: I544556c17a56dd1e36efded7ae565fa7d97fa8ba
2019-07-11 01:12:18 -07:00
tmfang
9b961232be Improve Settings launch performance am: 496d3f6f9c
am: 49d575b91c

Change-Id: I36d43b032a7ac815c680b1b875e0d7b5cf5e7e96
2019-07-11 01:12:16 -07:00
tmfang
c5e2ca58f8 Improve Settings launch performance am: 496d3f6f9c
am: edd86364f5

Change-Id: I1a90c8c49d6f226997e59b9af4518b93b7194e93
2019-07-11 01:12:16 -07:00
tmfang
49d575b91c Improve Settings launch performance
am: 496d3f6f9c

Change-Id: I16eb11d8850cbd75dd3571d16fce5758e5280bfd
2019-07-11 00:54:14 -07:00
tmfang
edd86364f5 Improve Settings launch performance
am: 496d3f6f9c

Change-Id: I5256fa0c04af07108b76cf21e9558b03d499e883
2019-07-11 00:54:14 -07:00
TreeHugger Robot
9df6623b73 Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-07-11 07:40:47 +00:00
Bill Yi
0336f3b4a8 [automerger skipped] Import translations. DO NOT MERGE
am: fa674d85ae -s ours
am skip reason: subject contains skip directive

Change-Id: I4b932251009efe11f3fc0dbaf547aa25d15a45d8
2019-07-11 00:06:07 -07:00
Bill Yi
c8334b2099 [automerger skipped] Import translations. DO NOT MERGE
am: fa674d85ae -s ours
am skip reason: subject contains skip directive

Change-Id: I60b58f9eb359488be6f3881f8e927131da2caf0e
2019-07-11 00:04:07 -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
1889efe2d0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia7da4c89d6e06b3d4dce7175a996decf1ea4af22
2019-07-10 20:45:25 -07:00
Bill Yi
fa674d85ae Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I67ba6e489c14dc511d485a4895c9e12fce1c3ee1
2019-07-10 20:08:17 -07:00
android-build-team Robot
88876f4f4d Snap for 5719479 from 0839185647 to qt-c2f2-release
Change-Id: I4a3c58cc05aecd644f80a6ef46e3506d476b0613
2019-07-11 03:05:54 +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
547532d23d [automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master" am: 0c7e805902 -s ours am: ba73db3e92 -s ours
am: 3bf8c80dd5

Change-Id: Icedb419472e0e1edcb4079f184d96df977fbd955
2019-07-10 19:14:53 -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 -s ours
am skip reason: subject contains skip directive

Change-Id: I8c1e220708b6ac50415a0c4f7b68784ab6fdf167
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 -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
android-build-team Robot
b31270766d Snap for 5716220 from 49175304a4 to qt-c2f2-release
Change-Id: I30eac8dcc72bf2209a3bf09d6915f827263de66b
2019-07-10 03:10:49 +00:00
Joshua Mccloskey
d82eedde6d Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
am: 0839185647

Change-Id: I5cc4c3393403bf8c299b415be81bc9b80fb93ca9
2019-07-09 19:46:38 -07:00
Joshua Mccloskey
915a4e127b Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
am: 0839185647

Change-Id: I3d79f210409ffbeea116882368f82abf218e6de7
2019-07-09 19:45:57 -07:00
Joshua Mccloskey
0839185647 Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
* changes:
  Favor setup face in search settings.
  Remove highlighting for work profile
2019-07-10 02:29:45 +00:00
Bill Yi
3e66bd6c7e [automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours
am: 49175304a4 -s ours
am skip reason: subject contains skip directive

Change-Id: I6038bd4afde5db15b1406099507515f1b7cd3e01
2019-07-09 17:41:57 -07:00
Bill Yi
d74b179378 [automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours
am: 6edf1646c1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia4d811d19fe140b31ad1b09eb57602a4ae0dba4c
2019-07-09 17:40:49 -07:00
Bill Yi
58a42a9565 [automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours
am: 49175304a4 -s ours
am skip reason: subject contains skip directive

Change-Id: I874777f8257c403ea12b844c273fded69cebd48e
2019-07-09 17:28:50 -07:00
Bill Yi
6edf1646c1 [automerger skipped] Import translations. DO NOT MERGE
am: 13d6e13166 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d8655c2b647674d28d223f5deb9b6d21b42d106
2019-07-09 17:17:49 -07:00