PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to using an intent for eSIM erasing

Browse Source 
We initially landed support for erasing an eSIM subscription in
ag/7208624 for b/124254555 using our own confirmation/progress UI, and
calling the EuiccManager.deleteSubscription method to do the
deletion. It turns out this is a low-level API which doesn't handle some
important cases such as subscription grouping or the eSIM slot not being
active.

This CL changes Settings to just launch an intent to begin an eSIM
Manager flow to delete a subscription that provides its own
confirmation/progress UI, and should properly handle subscription
grouping and making the eSIM slot active as needed.

Bug: 132114333
Test: make RunSettingsRoboTests
Change-Id: Ie59fea37fa73c5e6573e1181e271ffb5d453bd08
This commit is contained in:
Antony Sargent
2019-05-28 15:03:23 -07:00
parent fb28f92f71
commit c6e07c61d0
9 changed files with 61 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/com/android/settings/network/telephony/DeleteSimProfileConfirmationDialog.java
View File

@@ -1,83 +0,0 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.network.telephony;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.telephony.SubscriptionInfo;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class DeleteSimProfileConfirmationDialog extends InstrumentedDialogFragment implements
DialogInterface.OnClickListener {
public static final String TAG = "confirm_delete_sim";
public static final String KEY_SUBSCRIPTION_INFO = "subscription_info";
private SubscriptionInfo mInfo;
public static DeleteSimProfileConfirmationDialog newInstance(SubscriptionInfo info) {
final DeleteSimProfileConfirmationDialog dialog =
new DeleteSimProfileConfirmationDialog();
final Bundle args = new Bundle();
args.putParcelable(KEY_SUBSCRIPTION_INFO, info);
dialog.setArguments(args);
return dialog;
}
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
mInfo = getArguments().getParcelable(KEY_SUBSCRIPTION_INFO);
Context context = getContext();
final String message = context.getString(R.string.mobile_network_erase_sim_dialog_body,
mInfo.getCarrierName(), mInfo.getCarrierName());
return new AlertDialog.Builder(context)
.setTitle(R.string.mobile_network_erase_sim_dialog_title)
.setMessage(message)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.mobile_network_erase_sim_dialog_ok, this)
.create();
}
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
beginDeletionWithProgress();
}
}
@VisibleForTesting
void beginDeletionWithProgress() {
final DeleteSimProfileProgressDialog progress =
DeleteSimProfileProgressDialog.newInstance(mInfo.getSubscriptionId());
progress.setTargetFragment(getTargetFragment(), 0);
progress.show(getFragmentManager(), DeleteSimProfileProgressDialog.TAG);
}
@Override
public int getMetricsCategory() {
return SettingsEnums.DIALOG_DELETE_SIM_CONFIRMATION;
}
}

15
src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java
View File

@@ -17,7 +17,9 @@
package com.android.settings.network.telephony;
import android.content.Context;
import android.content.Intent;
import android.telephony.SubscriptionInfo;
import android.telephony.euicc.EuiccManager;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -31,12 +33,13 @@ public class DeleteSimProfilePreferenceController extends BasePreferenceControll
private SubscriptionInfo mSubscriptionInfo;
private Fragment mParentFragment;
private int mRequestCode;
public DeleteSimProfilePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
public void init(int subscriptionId, Fragment parentFragment) {
public void init(int subscriptionId, Fragment parentFragment, int requestCode) {
mParentFragment = parentFragment;
for (SubscriptionInfo info : SubscriptionUtil.getAvailableSubscriptions(
@@ -46,6 +49,7 @@ public class DeleteSimProfilePreferenceController extends BasePreferenceControll
break;
}
}
mRequestCode = requestCode;
}
@Override
@@ -53,11 +57,10 @@ public class DeleteSimProfilePreferenceController extends BasePreferenceControll
super.displayPreference(screen);
final Preference pref = screen.findPreference(getPreferenceKey());
pref.setOnPreferenceClickListener(p -> {
final DeleteSimProfileConfirmationDialog dialogFragment =
DeleteSimProfileConfirmationDialog.newInstance(mSubscriptionInfo);
dialogFragment.setTargetFragment(mParentFragment, 0);
dialogFragment.show(mParentFragment.getFragmentManager(),
DeleteSimProfileConfirmationDialog.TAG);
final Intent intent = new Intent(EuiccManager.ACTION_DELETE_SUBSCRIPTION_PRIVILEGED);
intent.putExtra(EuiccManager.EXTRA_SUBSCRIPTION_ID,
mSubscriptionInfo.getSubscriptionId());
mParentFragment.startActivityForResult(intent, mRequestCode);
return true;
});
}

120
src/com/android/settings/network/telephony/DeleteSimProfileProgressDialog.java
View File

@@ -1,120 +0,0 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.network.telephony;
import android.app.Activity;
import android.app.Dialog;
import android.app.PendingIntent;
import android.app.ProgressDialog;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.telephony.euicc.EuiccManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class DeleteSimProfileProgressDialog extends InstrumentedDialogFragment {
public static final String TAG = "delete_sim_progress";
// Note that this must be listed in AndroidManfiest.xml in a <protected-broadcast> tag
@VisibleForTesting
static final String PENDING_INTENT =
"com.android.settings.DELETE_SIM_PROFILE_RESULT";
private static final int PENDING_INTENT_REQUEST_CODE = 1;
private static final String KEY_SUBSCRIPTION_ID = "subscription_id";
@VisibleForTesting
static final String KEY_DELETE_STARTED = "delete_started";
private boolean mDeleteStarted;
private BroadcastReceiver mReceiver;
public static DeleteSimProfileProgressDialog newInstance(int subscriptionId) {
final DeleteSimProfileProgressDialog dialog = new DeleteSimProfileProgressDialog();
final Bundle args = new Bundle();
args.putInt(KEY_SUBSCRIPTION_ID, subscriptionId);
dialog.setArguments(args);
return dialog;
}
@Override
public void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(KEY_DELETE_STARTED, mDeleteStarted);
}
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
if (savedInstanceState != null) {
mDeleteStarted = savedInstanceState.getBoolean(KEY_DELETE_STARTED, false);
}
final Context context = getContext();
final ProgressDialog progressDialog = new ProgressDialog(context);
progressDialog.setMessage(
context.getString(R.string.mobile_network_erase_sim_dialog_progress));
mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
dismiss();
final Activity activity = getActivity();
if (activity != null && !activity.isFinishing()) {
activity.finish();
}
}
};
context.registerReceiver(mReceiver, new IntentFilter(PENDING_INTENT));
if (!mDeleteStarted) {
final PendingIntent pendingIntent = PendingIntent.getBroadcast(context,
PENDING_INTENT_REQUEST_CODE, new Intent(PENDING_INTENT),
PendingIntent.FLAG_ONE_SHOT);
final EuiccManager euiccManager = context.getSystemService(EuiccManager.class);
final int subId = getArguments().getInt(KEY_SUBSCRIPTION_ID);
euiccManager.deleteSubscription(subId, pendingIntent);
mDeleteStarted = true;
}
return progressDialog;
}
@Override
public void onDismiss(@NonNull DialogInterface dialog) {
if (mReceiver != null) {
final Context context = getContext();
if (context != null) {
context.unregisterReceiver(mReceiver);
}
mReceiver = null;
}
}
@Override
public int getMetricsCategory() {
return SettingsEnums.DIALOG_DELETE_SIM_PROGRESS;
}
}

11
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -61,6 +61,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
private static final String LOG_TAG = "NetworkSettings";
public static final int REQUEST_CODE_EXIT_ECM = 17;
public static final int REQUEST_CODE_DELETE_SUBSCRIPTION = 18;
@VisibleForTesting
static final String KEY_CLICKED_PREF = "key_clicked_pref";
@@ -138,7 +139,8 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
use(BillingCyclePreferenceController.class).init(mSubId);
use(MmsMessagePreferenceController.class).init(mSubId);
use(DisabledSubscriptionController.class).init(getLifecycle(), mSubId);
use(DeleteSimProfilePreferenceController.class).init(mSubId, this);
use(DeleteSimProfilePreferenceController.class).init(mSubId, this,
REQUEST_CODE_DELETE_SUBSCRIPTION);
}
use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);
@@ -226,6 +228,13 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
}
break;
case REQUEST_CODE_DELETE_SUBSCRIPTION:
final Activity activity = getActivity();
if (activity != null && !activity.isFinishing()) {
activity.finish();
}
break;
default:
break;
}