Commit Graph

53215 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
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
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
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
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
tmfang
edd86364f5 Improve Settings launch performance
am: 496d3f6f9c

Change-Id: I5256fa0c04af07108b76cf21e9558b03d499e883
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 -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
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
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
Andrew Sapperstein
0c1f7da25a Merge "Add UI for mainline modules licenses." into qt-dev
am: 72aded338a

Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7
2019-06-28 10:28:07 -07:00
Andrew Sapperstein
72aded338a Merge "Add UI for mainline modules licenses." into qt-dev 2019-06-28 16:56:04 +00:00
Winson Chung
8bf207bab6 Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am: 9591c3f963

Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77
2019-06-27 16:24:53 -07:00
Winson Chung
9591c3f963 Merge "Adding unique task affinity for FallbackHome activity" into qt-dev 2019-06-27 22:47:14 +00:00
android-build-team Robot
a4b837a9eb Snap for 5691606 from 5a69fac694 to qt-release
Change-Id: I4d441da970e4d09a0e8878a87ccd26ed3438601e
2019-06-27 03:09:11 +00:00
Louis Chang
397cdd6ead Adding unique task affinity for FallbackHome activity
Settings activities were launched and resided on home task
which was originally started by FallbackHome. Adding a
unique task affinity for FallbackHome activity in order to
prevent the task being reused by other Settings activities.

Bug: 135696366
Test: starting Settings activity before FallbackHome finishes
Change-Id: I3fe41dd3b77e37236b11006dbf08727783b6a2ec
2019-06-27 09:57:54 +08:00
Sunny Shao
27067657f2 Merge "Fixed the IllegalStateException on removing account" into qt-dev
am: 5a69fac694

Change-Id: I6d87742bd0925237cb73171561118e4bdd363b8a
2019-06-26 04:35:26 -07:00
TreeHugger Robot
5a69fac694 Merge "Fixed the IllegalStateException on removing account" into qt-dev 2019-06-26 11:15:35 +00:00
Antony Sargent
e4e1f08781 Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am: 3288037bd2

Change-Id: I0edcbba1f4c19052daeb2e69c2dc36e839641d9f
2019-06-25 23:02:14 -07:00
TreeHugger Robot
3288037bd2 Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev 2019-06-26 05:35:29 +00:00
android-build-team Robot
6bc3af2b27 Snap for 5688376 from 87fadeeb4a to qt-release
Change-Id: Id06481c506e326dae5bcfdd3099126e9e8c511ff
2019-06-26 03:04:05 +00:00
Andrew Sapperstein
56a8c33c1b Add UI for mainline modules licenses.
Added a module licenses option that lives in Legal information settings.
Clicking that option opens module licenses page, which displays every
module by name, filtered to exclude modules without license files.
Clicking a module in the list opens HTMLViewer.

Created ModuleLicensesProvider, a new ContentProvider that serves as a
redirect for the Uris sent to HTMLViewer so that they open asset files.
In order to provide the redirect, the provider will write the license file
to a file in Settings' cache directory when the license does not exist
in the cache or is outdated. The provider then opens that cached file.

Fixes: 135183006
Test: robotests
Change-Id: I7d69da34780c8c4efb150d0c0411078c12bc80d8
2019-06-25 16:01:38 -07:00
Antony Sargent
46d819272a Check isWfcProvisionedOnDevice in WifiCallingSettings
On the SIM details page, the preference leading to a page for
configuring wifi calling will appear based on the results of the
MobileNetworkUtils#isWifiCallingEnabled helper function. That helper
uses the ImsManager to check several conditions, among them both
isWfcEnabledByPlatform and isWfcProvisionedOnDevice.

The page for configuring wifi calling has a tabbed UX, with one tab for
each active subscription that supports it. The WifiCallingSettings class
gets a list of the active subscriptions to determine which tabs to show,
and removes any that don't support wifi calling, but was only using the
isWfcEnabledByPlatform test to do so. This is a problem because the code
for showing the contents inside the tab, in WifiCallingSettingsForSub,
includes a sanity check of isWfcProvisionedOnDevice and calls finish()
if that returns false.

What this meant in practice is that if you happened to have 2
subscriptions where one returns true for both isWfcEnabledByPlatform and
isWfcProvisionedOnDevice, but the other only returned true for
isWfcEnabledByPlatform, then you'd never be able to succesfully use the
wifi calling page at all because the tab for the subscription you
*aren't* trying to configure would always call finish() early.

The right long term solution to this problem is probably to remove the
tabbed UX entirely from this page, since we probably don't need it given
the overall new multi-SIM UX. But there may still be legacy uses and
that is likely a bigger change than we want to make right now.

As a stopgap, this CL just adds a check of isWfcProvisionedOnDevice to
the code for filtering out ineligible subscriptions from the tabbed
interface, which we should have always had anyway.

Fixes: 135591718
Test: make RunSettingsRoboTests
Change-Id: I656c3d3fb30cb6fabcb86685eae38c5f0cd0c6f2
2019-06-25 14:16:53 -07:00
Antony Sargent
bc50fb8aef Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am: 87fadeeb4a

Change-Id: I59e0e265a5e91bed12d7e786d4fdd3043c068fed
2019-06-25 11:40:48 -07:00
TreeHugger Robot
87fadeeb4a Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev 2019-06-25 17:54:54 +00:00