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

Commit 8be3ebd1 authored by SongFerng Wang's avatar SongFerng Wang Committed by Gerrit Code Review
Browse files

Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 

* changes:
  [MEP] Modify the comments
  Unable to enable the removable esim
  Reuse the active esim slot
  stop show preferred SIM card dialog during sim switch
parents 778d8511 e63dfcbd

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

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ public class SubscriptionUtil { 
                .stream()

                .filter(subInfo -> subInfo.getSubscriptionId() == subId)

                .findFirst()

                .get();

                .orElse(null);

    }



    /**

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

+83 −24
Original line number Diff line number Diff line
@@ -21,12 +21,18 @@ import android.app.PendingIntent; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.UiccCardInfo;

import android.telephony.UiccPortInfo;

import android.telephony.UiccSlotInfo;

import android.telephony.UiccSlotMapping;

import android.telephony.euicc.EuiccManager;

import android.util.Log;



import com.android.settings.SidecarFragment;

import com.android.settings.network.telephony.EuiccOperationSidecar;



import com.google.common.collect.ImmutableList;



import java.util.Collection;

import java.util.Comparator;

import java.util.List;

import java.util.stream.Collectors;
@@ -42,6 +48,7 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 
    private int mPort;

    private SubscriptionInfo mRemovedSubInfo;

    private boolean mIsDuringSimSlotMapping;

    private List<SubscriptionInfo> mActiveSubInfos;



    /** Returns a SwitchToEuiccSubscriptionSidecar sidecar instance. */

    public static SwitchToEuiccSubscriptionSidecar get(FragmentManager fm) {
@@ -85,6 +92,7 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 
        setState(State.RUNNING, Substate.UNUSED);

        mCallbackIntent = createCallbackIntent();

        mSubId = subscriptionId;



        int targetSlot = getTargetSlot();

        if (targetSlot < 0) {

            Log.d(TAG, "There is no esim, the TargetSlot is " + targetSlot);
@@ -92,20 +100,37 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 
            return;

        }



        SubscriptionManager subscriptionManager = getContext().getSystemService(

                SubscriptionManager.class);

        mActiveSubInfos = SubscriptionUtil.getActiveSubscriptions(subscriptionManager);



        // To check whether the esim slot's port is active. If yes, skip setSlotMapping. If no,

        // set this slot+port into setSimSlotMapping.

        mPort = (port < 0) ? getTargetPortId(removedSubInfo) : port;

        mPort = (port < 0) ? getTargetPortId(targetSlot, removedSubInfo) : port;

        mRemovedSubInfo = removedSubInfo;

        Log.d(TAG,

                String.format("set esim into the SubId%d Slot%d:Port%d",

                String.format("Set esim into the SubId%d Physical Slot%d:Port%d",

                        mSubId, targetSlot, mPort));



        if (mTelephonyManager.isMultiSimEnabled() && removedSubInfo != null

                && removedSubInfo.isEmbedded()) {

            // In DSDS mode+MEP, if the replaced esim is active, then it should be disabled esim

            // profile before changing SimSlotMapping process.

            // Use INVALID_SUBSCRIPTION_ID to disable the esim profile.

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

        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            // If the subId is INVALID_SUBSCRIPTION_ID, disable the esim (the default esim slot

            // which is selected by the framework).

            switchToSubscription();

        } else if ((mTelephonyManager.isMultiSimEnabled() && removedSubInfo != null

                && removedSubInfo.isEmbedded())

                || isEsimEnabledAtTargetSlotPort(targetSlot, mPort)) {

            // Case 1: In DSDS mode+MEP, if the replaced esim is active, then the replaced esim

            // should be disabled before changing SimSlotMapping process.

            //

            // Case 2: If the user enables the esim A on the target slot:port which is active

            // and there is an active esim B on target slot:port, then the settings disables the

            // esim B before the settings enables the esim A on the target slot:port.

            //

            // Step:

            // 1) Disables the replaced esim.

            // 2) Switches the SimSlotMapping if the target slot:port is not active.

            // 3) Enables the target esim.

            // Note: Use INVALID_SUBSCRIPTION_ID to disable the esim profile.

            Log.d(TAG, "Disable the enabled esim before the settings enables the target esim");

            mIsDuringSimSlotMapping = true;

            mEuiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, mPort,

                    mCallbackIntent);
@@ -114,12 +139,24 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 
        }

    }



    private int getTargetPortId(SubscriptionInfo removedSubInfo) {

        if (!mTelephonyManager.isMultiSimEnabled() || !isMultipleEnabledProfilesSupported()) {

            // In the 'SS mode' or 'DSDS+no MEP', the port is 0.

    private int getTargetPortId(int physicalEsimSlotIndex, SubscriptionInfo removedSubInfo) {

        if (!isMultipleEnabledProfilesSupported(physicalEsimSlotIndex)) {

            Log.d(TAG, "The slotId" + physicalEsimSlotIndex + " is no MEP, port is 0");

            return 0;

        }



        if (!mTelephonyManager.isMultiSimEnabled()) {

            // In the 'SS mode'

            // If there is the esim slot is active, the port is from the current esim slot.

            // If there is no esim slot in device, then the esim's port is 0.

            Collection<UiccSlotMapping> uiccSlotMappings = mTelephonyManager.getSimSlotMapping();

            Log.d(TAG, "In SS mode, the UiccSlotMapping: " + uiccSlotMappings);

            return uiccSlotMappings.stream()

                    .filter(i -> i.getPhysicalSlotIndex() == physicalEsimSlotIndex)

                    .mapToInt(i -> i.getPortIndex())

                    .findFirst().orElse(0);

        }



        // In the 'DSDS+MEP', if the removedSubInfo is esim, then the port is

        // removedSubInfo's port.

        if (removedSubInfo != null && removedSubInfo.isEmbedded()) {
@@ -136,11 +173,12 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 
        // port is 0.



        int port = 0;

        SubscriptionManager subscriptionManager = getContext().getSystemService(

                SubscriptionManager.class);

        if(mActiveSubInfos == null){

            Log.d(TAG, "mActiveSubInfos is null.");

            return port;

        }

        List<SubscriptionInfo> activeEsimSubInfos =

                SubscriptionUtil.getActiveSubscriptions(subscriptionManager)

                        .stream()

                mActiveSubInfos.stream()

                        .filter(i -> i.isEmbedded())

                        .sorted(Comparator.comparingInt(SubscriptionInfo::getPortIndex))

                        .collect(Collectors.toList());
@@ -153,7 +191,31 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 
    }



    private int getTargetSlot() {

        return UiccSlotUtil.getEsimSlotId(getContext());

        return UiccSlotUtil.getEsimSlotId(getContext(), mSubId);

    }



    private boolean isEsimEnabledAtTargetSlotPort(int physicalSlotIndex, int portIndex) {

        int logicalSlotId = getLogicalSlotIndex(physicalSlotIndex, portIndex);

        if (logicalSlotId == SubscriptionManager.INVALID_SIM_SLOT_INDEX) {

            return false;

        }

        return mActiveSubInfos != null

                && mActiveSubInfos.stream()

                .anyMatch(i -> i.isEmbedded() && i.getSimSlotIndex() == logicalSlotId);

    }



    private int getLogicalSlotIndex(int physicalSlotIndex, int portIndex) {

        ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(mTelephonyManager);

        if (slotInfos != null && physicalSlotIndex >= 0 && physicalSlotIndex < slotInfos.size()

                && slotInfos.get(physicalSlotIndex) != null) {

            for (UiccPortInfo portInfo : slotInfos.get(physicalSlotIndex).getPorts()) {

                if (portInfo.getPortIndex() == portIndex) {

                    return portInfo.getLogicalSlotIndex();

                }

            }

        }



        return SubscriptionManager.INVALID_SIM_SLOT_INDEX;

    }



    private void onSwitchSlotSidecarStateChange() {
@@ -171,14 +233,11 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar { 
        }

    }



    private boolean isMultipleEnabledProfilesSupported() {

    private boolean isMultipleEnabledProfilesSupported(int physicalEsimSlotIndex) {

        List<UiccCardInfo> cardInfos = mTelephonyManager.getUiccCardsInfo();

        if (cardInfos == null) {

            Log.w(TAG, "UICC cards info list is empty.");

            return false;

        }

        return cardInfos.stream().anyMatch(

                cardInfo -> cardInfo.isMultipleEnabledProfilesSupported());

        return cardInfos.stream()

                .anyMatch(cardInfo -> cardInfo.getPhysicalSlotIndex() == physicalEsimSlotIndex

                        && cardInfo.isMultipleEnabledProfilesSupported());

    }



    private void switchToSubscription() {

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

+37 −1
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ import android.provider.Settings; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.UiccCardInfo;

import android.telephony.UiccSlotInfo;

import android.telephony.UiccSlotMapping;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.uicc.UiccController;

import com.android.settingslib.utils.ThreadUtils;



import com.google.common.collect.ImmutableList;
@@ -36,6 +38,7 @@ import java.lang.annotation.RetentionPolicy; 
import java.util.ArrayList;

import java.util.Collection;

import java.util.Comparator;

import java.util.List;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

import java.util.stream.Collectors;
@@ -183,9 +186,27 @@ public class UiccSlotUtil { 
     * @param context the application context.

     * @return the esim slot. If the value is -1, there is not the esim.

     */

    public static int getEsimSlotId(Context context) {

    public static int getEsimSlotId(Context context, int subId) {

        TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);

        List<UiccCardInfo> uiccCardInfos = telMgr.getUiccCardsInfo();

        ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(telMgr);

        SubscriptionManager subscriptionManager = context.getSystemService(

                SubscriptionManager.class);

        SubscriptionInfo subInfo = SubscriptionUtil.getSubById(subscriptionManager, subId);



        // checking whether this is the removable esim. If it is, then return the removable slot id.

        if (subInfo != null && subInfo.isEmbedded()) {

            for (UiccCardInfo uiccCardInfo : uiccCardInfos) {

                if (uiccCardInfo.getCardId() == subInfo.getCardId()

                        && uiccCardInfo.getCardId() > TelephonyManager.UNSUPPORTED_CARD_ID

                        && uiccCardInfo.isEuicc()

                        && uiccCardInfo.isRemovable()) {

                    Log.d(TAG, "getEsimSlotId: This subInfo is a removable esim.");

                    return uiccCardInfo.getPhysicalSlotIndex();

                }

            }

        }



        int firstEsimSlot = IntStream.range(0, slotInfos.size())

                .filter(

                        index -> {
@@ -282,6 +303,21 @@ public class UiccSlotUtil { 
    // 1. pSIM's logical slots always is [RIL 0].

    // 2. assign the new active port to the same stack that will be de-activated

    //    For example: mode#3->mode#4

    // 3. Add an eSIM carrier or enable eSIM carrier. The cases are at the below.

    //    1) 1   => 2 / 2.1 / 3 / 3.1

    //    2) 2   => 1 / 3 / 3.2

    //    3) 2.1 => 3.1 / 4

    //    4) 3   => 4

    //    5) 3.1 => 3.2

    //    Note:

    //        1) 2 <=> 2.1  blocked by LPA (reason: existing active port in SS so just re-use)

    //        2) 3 <=> 3.1 blocked by LPA (reason: if pSIM+an active port, re-use the active port)

    // 4. pSIM insertion or enabling

    //     1) 2   => 1 / 3

    //     2) 2.1 => 1 / 3.1

    //     3) 3.2 => 3 / 3.1

    //     4) 4   => 3 / 3.1





    @VisibleForTesting

    static Collection<UiccSlotMapping> prepareUiccSlotMappings(

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

+26 −1
Original line number Diff line number Diff line
@@ -16,8 +16,12 @@ 


package com.android.settings.network.telephony;



import static android.content.Context.MODE_PRIVATE;



import android.content.SharedPreferences;

import android.os.Bundle;

import android.telephony.SubscriptionManager;

import android.util.Log;



import androidx.fragment.app.FragmentActivity;
@@ -27,14 +31,27 @@ public class SubscriptionActionDialogActivity extends FragmentActivity { 
    private static final String TAG = "SubscriptionActionDialogActivity";

    // Arguments

    protected static final String ARG_SUB_ID = "sub_id";



    protected SubscriptionManager mSubscriptionManager;



    public static final String SIM_ACTION_DIALOG_PREFS = "sim_action_dialog_prefs";

    // Shared preference keys

    public static final String KEY_PROGRESS_STATE = "progress_state";

    public static final int PROGRESS_IS_NOT_SHOWING = 0;

    public static final int PROGRESS_IS_SHOWING = 1;



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        mSubscriptionManager = getSystemService(SubscriptionManager.class);

        setProgressState(PROGRESS_IS_NOT_SHOWING);

    }





    @Override

    public void finish() {

        setProgressState(PROGRESS_IS_NOT_SHOWING);

        super.finish();

    }



    /**
@@ -44,11 +61,13 @@ public class SubscriptionActionDialogActivity extends FragmentActivity { 
     */

    protected void showProgressDialog(String message) {

        ProgressDialogFragment.show(getFragmentManager(), message, null);

        setProgressState(PROGRESS_IS_SHOWING);

    }



    /** Dismisses the loading dialog. */

    protected void dismissProgressDialog() {

        ProgressDialogFragment.dismiss(getFragmentManager());

        setProgressState(PROGRESS_IS_NOT_SHOWING);

    }



    /**
@@ -60,4 +79,10 @@ public class SubscriptionActionDialogActivity extends FragmentActivity { 
    protected void showErrorDialog(String title, String message) {

        AlertDialogFragment.show(this, title, message);

    }



    protected void setProgressState(int state) {

        final SharedPreferences prefs = getSharedPreferences(SIM_ACTION_DIALOG_PREFS, MODE_PRIVATE);

        prefs.edit().putInt(KEY_PROGRESS_STATE, state).apply();

        Log.i(TAG, "setProgressState:" + state);

    }

}

src/com/android/settings/sim/SimDialogActivity.java

+19 −0
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ 


package com.android.settings.sim;



import static android.content.Context.MODE_PRIVATE;



import android.app.Activity;

import android.content.Intent;

import android.content.SharedPreferences;

import android.os.Bundle;

import android.telecom.PhoneAccountHandle;

import android.telecom.TelecomManager;
@@ -32,6 +35,7 @@ import androidx.fragment.app.FragmentActivity; 
import androidx.fragment.app.FragmentManager;



import com.android.settings.R;

import com.android.settings.network.telephony.SubscriptionActionDialogActivity;



import java.util.List;
@@ -60,6 +64,7 @@ public class SimDialogActivity extends FragmentActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addSystemFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        showOrUpdateDialog();
@@ -72,6 +77,13 @@ public class SimDialogActivity extends FragmentActivity { 
        showOrUpdateDialog();

    }



    private int getProgressState() {

        final SharedPreferences prefs = getSharedPreferences(

                SubscriptionActionDialogActivity.SIM_ACTION_DIALOG_PREFS, MODE_PRIVATE);

        return prefs.getInt(SubscriptionActionDialogActivity.KEY_PROGRESS_STATE,

                SubscriptionActionDialogActivity.PROGRESS_IS_NOT_SHOWING);

    }



    private void showOrUpdateDialog() {

        final int dialogType = getIntent().getIntExtra(DIALOG_TYPE_KEY, INVALID_PICK);
@@ -80,6 +92,13 @@ public class SimDialogActivity extends FragmentActivity { 
            return;

        }



        if (dialogType == PREFERRED_PICK

                && getProgressState() == SubscriptionActionDialogActivity.PROGRESS_IS_SHOWING) {

            Log.d(TAG, "Finish the sim dialog since the sim action dialog is showing the progress");

            finish();

            return;

        }



        final String tag = Integer.toString(dialogType);

        final FragmentManager fragmentManager = getSupportFragmentManager();

        SimDialogFragment fragment = (SimDialogFragment) fragmentManager.findFragmentByTag(tag);