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

Merge "Fix minor issue for DeleteEuiccSubscriptionDialogActivity"

Browse Source
This commit is contained in:
Jiashen Wang
2020-12-15 01:32:15 +00:00
committed by Android (Google) Code Review
parent afdf5ed0d4 a0a5165c72
commit 881d253247
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
View File

@@ -54,7 +54,6 @@ public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDia
private DeleteEuiccSubscriptionSidecar mDeleteEuiccSubscriptionSidecar; private DeleteEuiccSubscriptionSidecar mDeleteEuiccSubscriptionSidecar;
private List<SubscriptionInfo> mSubscriptionsToBeDeleted; private List<SubscriptionInfo> mSubscriptionsToBeDeleted;
private SubscriptionInfo mSubscriptionToBeDeleted; private SubscriptionInfo mSubscriptionToBeDeleted;
private AlertDialog mDeleteSimConfirmDialog;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -65,14 +64,14 @@ public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDia
mSubscriptionToBeDeleted = SubscriptionUtil.getSubById(mSubscriptionManager, subId); mSubscriptionToBeDeleted = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
mSubscriptionsToBeDeleted = mSubscriptionsToBeDeleted =
SubscriptionUtil.findAllSubscriptionsInGroup(mSubscriptionManager, subId); SubscriptionUtil.findAllSubscriptionsInGroup(mSubscriptionManager, subId);
mDeleteEuiccSubscriptionSidecar = DeleteEuiccSubscriptionSidecar.get(getFragmentManager());
if (mSubscriptionToBeDeleted == null || mDeleteEuiccSubscriptionSidecar == null) { if (mSubscriptionToBeDeleted == null || mSubscriptionsToBeDeleted.isEmpty()) {
Log.e(TAG, "Cannot find subscription with sub ID: " + subId); Log.e(TAG, "Cannot find subscription with sub ID: " + subId);
finish(); finish();
return; return;
} }
mDeleteEuiccSubscriptionSidecar = DeleteEuiccSubscriptionSidecar.get(getFragmentManager());
if (savedInstanceState == null) { if (savedInstanceState == null) {
showDeleteSimConfirmDialog(); showDeleteSimConfirmDialog();
} }

2
src/com/android/settings/network/telephony/EuiccOperationSidecar.java
View File

@@ -105,7 +105,7 @@ public abstract class EuiccOperationSidecar extends SidecarFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mEuiccManager = (EuiccManager) getContext().getSystemService(Context.EUICC_SERVICE); mEuiccManager = getContext().getSystemService(EuiccManager.class);
getContext() getContext()
.getApplicationContext() .getApplicationContext()