Commit Graph

9078 Commits

Author SHA1 Message Date
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
joshmccloskey
365beaebdb Update FaceSlice to use correct pref & FaceManager
Fixes: 137137134
Test: Manual.
Change-Id: Idc707a7d2009975f81902867e4c37a8ee5775700
2019-07-11 16:28:21 +00:00
Mark Chien
649f98541a Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
am: 8a44e4f274

Change-Id: Ifabc853b754fd6323e01246613656fe72961c253
2019-07-03 17:19:49 -07:00
Mark Chien
8a44e4f274 Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev 2019-07-03 13:16:03 +00:00
Amin Shaikh
fea6983c2b Merge "Update ic_sync_problem to GM2." into qt-r1-dev
am: 0217400ea5

Change-Id: I5c9d11a15eb86f60d91ebd3110ccc33fdefdf981
2019-07-01 05:08:46 -07:00
TreeHugger Robot
0217400ea5 Merge "Update ic_sync_problem to GM2." into qt-r1-dev 2019-07-01 11:52:33 +00:00
Joel Galenson
9aa82c09fe Remove Permissions Hub. DO NOT MERGE
am: 69d9899868

Change-Id: I672b8c4f4184a0a2b96a0a7320103ef1754ff54e
2019-06-28 14:54:06 -07:00
Amin Shaikh
3e484def2f Update Settings overlayed icons.
am: c477507f4e

Change-Id: Ia3ac06b30d829a14891c0811a89869640ccd225c
2019-06-28 14:53:48 -07:00
Amin Shaikh
84c3f60ef5 Update ic_sync_problem to GM2.
- Use tint instead of custom fillColor to be consistent with overlays.
- Standardize on using @android:color/white as fill color
- Update list of overlayed icons.

Bug: 131346125
Test: make
Change-Id: I4bc88e5842ba2f149356929a77b81459ce5042c5
2019-06-28 16:35:24 -04:00
Andrew Sapperstein
722f8c0ac1 Merge "Add UI for mainline modules licenses." into qt-dev am: 72aded338a
am: 0c1f7da25a

Change-Id: I7e3ce8019cc4a411dec6ebf72b8518e1026ed73d
2019-06-28 10:47:58 -07:00
Andrew Sapperstein
647f685063 Merge "Add UI for mainline modules licenses." into qt-dev
am: 72aded338a

Change-Id: I93faf2c99489405fe82a75adf24f4d885bbe1558
2019-06-28 10:32:22 -07: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
Evan Severson
f461d8dc52 Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev 2019-06-27 21:21:56 +00:00
Amin Shaikh
c477507f4e Update Settings overlayed icons.
- Use tint instead of custom fillColor to be consistent with overlays.
- Update list of overlayed icons.

Bug: 131346125
Test: make
Change-Id: Ib548c0b47db0064bcb1536c9b7a650912f28273f
Merged-In: Ib548c0b47db0064bcb1536c9b7a650912f28273f
2019-06-27 14:49:20 +00:00
Joel Galenson
69d9899868 Remove Permissions Hub. DO NOT MERGE
Bug: 132292477
Test: View all related screens.
(cherry picked from commit 1e7c172ad5)

This should have been submitted with ag/8109287
Bug: 136012133
Test: Clicked through permission screens on cuttlefish

Change-Id: I2663aa365baf78ccc6f0a3d585b09da0dd387970
2019-06-26 20:58:18 +00:00
markchien
0331222483 Fix entitlement failed when device is on CBRS
When active cellular internet is switched to CBRS in DSDS case,
default data sub id may not be changed. Fix by using active
subscription id and pass this sub id to entitlement app.

Bug: 134994718
Test: atest TetherServiceTest
Test: manual test with carrer SIMs.

Change-Id: I30a1d70c0690f0dba8f4171a2bde884f9b7ccfc4
2019-06-26 17:05:48 +00:00
Antony Sargent
85a2cd23f7 Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am: 3288037bd2
am: e4e1f08781

Change-Id: I5142d6a71e16dca999c4370ab65a371d90563aed
2019-06-25 23:11:15 -07: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
Antony Sargent
fb52368873 Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am: 3288037bd2

Change-Id: I5833f9ece2590b16ef3184f8d315fd092f683207
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
Joshua Mccloskey
ef3d1939c8 Merge "Adding slice for Face Enrollment" into qt-r1-dev
am: 35252d1b9f

Change-Id: Ic36d9fd8f00b01fe4c35e005cd9192b9cfe900e9
2019-06-25 18:58:54 -07:00
Joshua Mccloskey
35252d1b9f Merge "Adding slice for Face Enrollment" into qt-r1-dev 2019-06-26 01:15:50 +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
TreeHugger Robot
01d889815d Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-25 19:24:19 +00: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
Bill Yi
1f064f21bc Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6a0682180e39156f0959521d47ec707c8da28819
2019-06-25 10:33:04 -07:00
TreeHugger Robot
279050c8d6 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-25 14:46:00 +00:00
Bill Yi
fe1b808001 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I275c2124cebaca1f069837b138a01b9e11f77c55
2019-06-25 04:07:28 -07:00
joshmccloskey
6634c159fd Adding slice for Face Enrollment
Fixes: 134965754
Test: Verified slice appears when not enrolled.
Test: Verified slice does not appear when enrolled.
Test: Verified slice disappears after clicking on icon and going back
to settings page.
Change-Id: Id1c4458742ab622df8d5881e926fe54684b36843
2019-06-24 17:41:36 -07:00
Hai Zhang
3603e24840 Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
am: 5f8c446f47

Change-Id: I4697c719c9274bd9a0ba5d4c8edf9e9a77454b7b
2019-06-24 14:32:28 -07:00
Hai Zhang
636920da48 Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
am: b39810f5ab

Change-Id: Ia72e4fb5d1a7c930657ca26f15c58cd39220fe5e
2019-06-24 14:28:54 -07:00
Hai Zhang
5f8c446f47 Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
am: b39810f5ab

Change-Id: I8ab0452cd656d25afe164dec49553512decfdcec
2019-06-24 14:28:54 -07:00
Hai Zhang
71f2614736 Revert "Add special apps access settings page for financial app."
This reverts commit 43374eabb8.

Reason for revert: No longer needed because we are using whitelist for
SMS permission

Fixes: 135213238
Test: presubmit
Change-Id: I182be4a1136521f325866e70e875439c17816ef2
2019-06-24 21:11:36 +00:00
Antony Sargent
45f0701380 Add a listener for subscription changes to SimDialogFragment
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.

But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.

Fixes: 135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
(cherry picked from commit 6a1d7e60ac)
2019-06-24 16:58:40 +00:00
Julia Reynolds
25d55fb821 Remove dead code am: ab63fd3c25
am: bf35e5cc55

Change-Id: Idae478e2764f731f3a7f60a0da6752ba5ec88968
2019-06-21 10:23:27 -07:00
Julia Reynolds
3370e6cfb9 Remove dead code
am: ab63fd3c25

Change-Id: Ie0ff97b0db868f4f5aff19c4d8da2a8fc2a5717d
2019-06-21 10:15:12 -07:00
Julia Reynolds
bf35e5cc55 Remove dead code
am: ab63fd3c25

Change-Id: I8d629b89f8b8145e8381301d888aeb8b050123c8
2019-06-21 10:15:12 -07:00
Julia Reynolds
ab63fd3c25 Remove dead code
Test: try to search 'gentle'
Fixes: 135640138
Change-Id: If03703e59f77206da08fc80e88bb986f821c18fe
2019-06-21 13:24:05 +00:00
Raff Tsai
864af1ff82 Merge "Cannot switch between multiple TTS engines" into qt-dev am: 753215fff9
am: 2c01fb911c

Change-Id: I74218aa4739f81aade84ba1e4ab9bb9ca090c7a2
2019-06-19 23:24:02 -07:00
Raff Tsai
2c01fb911c Merge "Cannot switch between multiple TTS engines" into qt-dev
am: 753215fff9

Change-Id: I5d399c7f653caf53041f1136948f4a8de457d7c5
2019-06-19 22:57:25 -07:00
Raff Tsai
72b48c91f8 Merge "Cannot switch between multiple TTS engines" into qt-dev
am: 753215fff9

Change-Id: Ia48e40c15b7c07e538e87e3c7ec242543c9f0d8c
2019-06-19 22:57:06 -07:00
Antony Sargent
d985cb848f Add a listener for subscription changes to SimDialogFragment
am: 6a1d7e60ac

Change-Id: I7fe944662d3a37223a997ed55d3197764df42a90
2019-06-19 19:07:32 -07:00
Antony Sargent
6a1d7e60ac Add a listener for subscription changes to SimDialogFragment
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.

But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.

Fixes: 135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
2019-06-19 12:20:59 -07:00
Raff Tsai
39c6a16aba Cannot switch between multiple TTS engines
That is caused by layout xml changes. The radio button was clickable
in old xml resource. But it is not clickable in new xml resource.
Therefore we can't receive click callback. Fixed by changing
Radio button state when preference is clicked.

Fixes: 135285101
Test: manual, make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.tts"
Change-Id: Idd7bf37d9ccbc1b56d41978d19dc05c8a81cc49a
2019-06-19 16:35:35 +08:00
Malcolm Chen
47ea5ad9dc Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce
am: b3b52ce088

Change-Id: I672ddbb1a853d16e7a17a2c95fa4754e17d7055c
2019-06-18 20:48:05 -07:00
Matthew Fritze
ae7ca4133a Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3
am: 1601d41f8a

Change-Id: Ic1bce363e5b6d6a5e52fcf3da6547d1976333f2e
2019-06-18 20:39:39 -07:00
Malcolm Chen
b3b52ce088 Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
am: 0304f4d1ce

Change-Id: I3a78fe154d3861c779365d1e611ac8c559861a10
2019-06-18 20:29:39 -07:00