Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 881d2532 authored by Jiashen Wang's avatar Jiashen Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix minor issue for DeleteEuiccSubscriptionDialogActivity"

parents afdf5ed0 a0a5165c

src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDia 
    private DeleteEuiccSubscriptionSidecar mDeleteEuiccSubscriptionSidecar;

    private List<SubscriptionInfo> mSubscriptionsToBeDeleted;

    private SubscriptionInfo mSubscriptionToBeDeleted;

    private AlertDialog mDeleteSimConfirmDialog;



    @Override

    protected void onCreate(Bundle savedInstanceState) {
@@ -65,14 +64,14 @@ public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDia 
        mSubscriptionToBeDeleted = SubscriptionUtil.getSubById(mSubscriptionManager, subId);

        mSubscriptionsToBeDeleted =

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

            finish();

            return;

        }



        mDeleteEuiccSubscriptionSidecar = DeleteEuiccSubscriptionSidecar.get(getFragmentManager());

        if (savedInstanceState == null) {

            showDeleteSimConfirmDialog();

        }

src/com/android/settings/network/telephony/EuiccOperationSidecar.java

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public abstract class EuiccOperationSidecar extends SidecarFragment { 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mEuiccManager = (EuiccManager) getContext().getSystemService(Context.EUICC_SERVICE);

        mEuiccManager = getContext().getSystemService(EuiccManager.class);



        getContext()

                .getApplicationContext()