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

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;
});
}