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

Commit e28eaa72 authored by SongFerngWang's avatar SongFerngWang
Browse files

[MEP] Use switchToSub API with pending intent 

It is based on the framework refactor. ag/16494924  Framework
changed the API, so here modifies it.

Bug: 205504646
Test: WIP manual
Change-Id: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
parent bf148dea

src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java

+2 −28
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.network; 




import android.app.FragmentManager;

import android.app.FragmentManager;

import android.app.PendingIntent;

import android.app.PendingIntent;

import android.content.Intent;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.telephony.UiccCardInfo;

import android.telephony.UiccCardInfo;
@@ -106,21 +105,8 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 
            // Use INVALID_SUBSCRIPTION_ID to disable the esim profile.

            // Use INVALID_SUBSCRIPTION_ID to disable the esim profile.

            // The SimSlotMapping is ready, then to execute activate/inactivate esim.

            // The SimSlotMapping is ready, then to execute activate/inactivate esim.

            mIsDuringSimSlotMapping = true;

            mIsDuringSimSlotMapping = true;

            EuiccManager.ResultListener callback = new EuiccManager.ResultListener() {

                @Override

                public void onComplete(int resultCode, Intent resultIntent) {

                    Log.i(TAG, String.format("Result code : %d;", resultCode));

                    if (resultCode == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK) {

                        mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort,

                                removedSubInfo);

                    } else {

                        setState(State.ERROR, resultCode);

                    }

                }

            };

            mEuiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, mPort,

            mEuiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, mPort,

                    getContext().getMainExecutor(),

                    mCallbackIntent);

                    callback);

        } else {

        } else {

            mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort, removedSubInfo);

            mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort, removedSubInfo);

        }

        }
@@ -187,19 +173,7 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 




    private void switchToSubscription() {

    private void switchToSubscription() {

        // The SimSlotMapping is ready, then to execute activate/inactivate esim.

        // The SimSlotMapping is ready, then to execute activate/inactivate esim.

        EuiccManager.ResultListener callback = new EuiccManager.ResultListener() {

        mEuiccManager.switchToSubscription(mSubId, mPort, mCallbackIntent);

            @Override

            public void onComplete(int resultCode, Intent resultIntent) {

                Log.i(TAG, String.format("Result code : %d;", resultCode));

                if (resultCode == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK) {

                    setState(State.SUCCESS, Substate.UNUSED);

                } else {

                    setState(State.ERROR, resultCode);

                }

            }

        };

        mEuiccManager.switchToSubscription(mSubId, mPort, getContext().getMainExecutor(),

                callback);

    }

    }





    @Override

    @Override