Add checkbox to let user wipe eSIM data together with FDR
This CL add a check box for eSIM enabled devices to reset eSIM data
during factory reset of the phone.
Bug: 67500470
Test: make RunSettingsRoboTests
Change-Id: I5a81d43f23ae55f8549a5b807fdf41f36c9d3acd
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 3cc722b..a6006f8 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -78,6 +78,9 @@
private static final int KEYGUARD_REQUEST = 55;
private static final int CREDENTIAL_CONFIRM_REQUEST = 56;
+ private static final String KEY_SHOW_ESIM_RESET_CHECKBOX
+ = "masterclear.allow_retain_esim_profiles_after_fdr";
+
static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
static final String ERASE_ESIMS_EXTRA = "erase_esim";
@@ -85,6 +88,8 @@
private Button mInitiateButton;
private View mExternalStorageContainer;
@VisibleForTesting CheckBox mExternalStorage;
+ private View mEsimStorageContainer;
+ @VisibleForTesting CheckBox mEsimStorage;
private ScrollView mScrollView;
private final OnGlobalLayoutListener mOnGlobalLayoutListener = new OnGlobalLayoutListener() {
@@ -134,8 +139,7 @@
void showFinalConfirmation() {
Bundle args = new Bundle();
args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
- // TODO: Offer the user a choice to wipe eSIMs when it is technically feasible to do so.
- args.putBoolean(ERASE_ESIMS_EXTRA, true);
+ args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
((SettingsActivity) getActivity()).startPreferencePanel(
this, MasterClearConfirm.class.getName(),
args, R.string.master_clear_confirm_title, null, null, 0);
@@ -214,6 +218,8 @@
mInitiateButton.setOnClickListener(mInitiateListener);
mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
mExternalStorage = (CheckBox) mContentView.findViewById(R.id.erase_external);
+ mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+ mEsimStorage = (CheckBox) mContentView.findViewById(R.id.erase_esim);
mScrollView = (ScrollView) mContentView.findViewById(R.id.master_clear_scrollview);
/*
@@ -248,11 +254,25 @@
}
if (showWipeEuicc()) {
- final View esimAlsoErased = mContentView.findViewById(R.id.also_erases_esim);
- esimAlsoErased.setVisibility(View.VISIBLE);
+ if (showWipeEuiccCheckbox()) {
+ TextView title = mContentView.findViewById(R.id.erase_esim_title);
+ title.setText(R.string.erase_esim_storage);
+ mEsimStorageContainer.setVisibility(View.VISIBLE);
+ mEsimStorageContainer.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mEsimStorage.toggle();
+ }
+ });
+ } else {
+ final View esimAlsoErased = mContentView.findViewById(R.id.also_erases_esim);
+ esimAlsoErased.setVisibility(View.VISIBLE);
- final View noCancelMobilePlan = mContentView.findViewById(R.id.no_cancel_mobile_plan);
- noCancelMobilePlan.setVisibility(View.VISIBLE);
+ final View noCancelMobilePlan = mContentView.findViewById(
+ R.id.no_cancel_mobile_plan);
+ noCancelMobilePlan.setVisibility(View.VISIBLE);
+ mEsimStorage.setChecked(true /* checked */);
+ }
}
final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
@@ -294,6 +314,12 @@
}
@VisibleForTesting
+ boolean showWipeEuiccCheckbox() {
+ return SystemProperties
+ .getBoolean(KEY_SHOW_ESIM_RESET_CHECKBOX, false /* def */);
+ }
+
+ @VisibleForTesting
protected boolean isEuiccEnabled(Context context) {
EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
return euiccManager.isEnabled();
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 53d9386..bc0fa77 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -81,8 +81,7 @@
@Override
protected Boolean doInBackground(Void... params) {
- return mRecoverySystem.wipeEuiccData(
- mContext, true /* isWipeEuicc */, mPackageName);
+ return mRecoverySystem.wipeEuiccData(mContext, mPackageName);
}
@Override
diff --git a/src/com/android/settings/wrapper/RecoverySystemWrapper.java b/src/com/android/settings/wrapper/RecoverySystemWrapper.java
index 8a36969..c7ce244 100644
--- a/src/com/android/settings/wrapper/RecoverySystemWrapper.java
+++ b/src/com/android/settings/wrapper/RecoverySystemWrapper.java
@@ -29,11 +29,10 @@
/**
* Returns whether wipe Euicc data successfully or not.
*
- * @param isWipeEuicc whether we want to wipe Euicc data or not
* @param packageName the package name of the caller app.
*/
public boolean wipeEuiccData(
- Context context, final boolean isWipeEuicc, final String packageName) {
- return RecoverySystem.wipeEuiccData(context, isWipeEuicc, packageName);
+ Context context, final String packageName) {
+ return RecoverySystem.wipeEuiccData(context, packageName);
}
}