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

Commit 8a9b881a authored by Muralidhar Reddy Mule's avatar Muralidhar Reddy Mule Committed by Android (Google) Code Review
Browse files

Merge "[MEP] Issue with phoneId and portIndex mapping during pSim absent"

parents e73413df 63648fd1

src/java/com/android/internal/telephony/uicc/UiccPort.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Message;

import android.os.RemoteException;

import android.telephony.SubscriptionInfo;

import android.telephony.TelephonyManager;



import com.android.internal.annotations.GuardedBy;
@@ -495,7 +496,7 @@ public class UiccPort { 
        pw.println(" this=" + this);

        pw.println(" mPortIdx=" + mPortIdx);

        pw.println(" mCi=" + mCi);

        pw.println(" mIccid=" + mIccid);

        pw.println(" mIccid=" + SubscriptionInfo.givePrintableIccid(mIccid));

        pw.println(" mPhoneId=" + mPhoneId);

        pw.println(" mPhysicalSlotIndex=" + mPhysicalSlotIndex);

        synchronized (mOpenChannelRecords) {

src/java/com/android/internal/telephony/uicc/UiccSlot.java

+11 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Handler; 
import android.os.Message;

import android.os.PowerManager;

import android.os.UserHandle;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;
@@ -46,6 +47,7 @@ import java.io.FileDescriptor; 
import java.io.PrintWriter;

import java.util.HashMap;

import java.util.Map;

import java.util.stream.Collectors;



/**

 * This class represents a physical slot on the device.
@@ -317,7 +319,6 @@ public class UiccSlot extends Handler { 
        }

        mStateIsUnknown = stateUnknown;

        mUiccCard = null;

        mPortIdxToPhoneId.clear();

    }



    public boolean isStateUnknown() {
@@ -537,6 +538,13 @@ public class UiccSlot extends Handler { 
        Rlog.e(TAG, msg);

    }



    private Map<Integer, String> getPrintableIccIds() {

        Map<Integer, String> printableIccIds = mIccIds.entrySet().stream()

                .collect(Collectors.toMap(Map.Entry::getKey,

                        e -> SubscriptionInfo.givePrintableIccid(e.getValue())));

        return printableIccIds;

    }



    /**

     * Dump

     */
@@ -548,7 +556,8 @@ public class UiccSlot extends Handler { 
                + isMultipleEnabledProfileSupported());

        pw.println(" mIsRemovable=" + mIsRemovable);

        pw.println(" mLastRadioState=" + mLastRadioState);

        pw.println(" mIccIds=" + mIccIds.values());

        pw.println(" mIccIds=" + getPrintableIccIds());

        pw.println(" mPortIdxToPhoneId=" + mPortIdxToPhoneId);

        pw.println(" mEid=" + mEid);

        pw.println(" mCardState=" + mCardState);

        if (mUiccCard != null) {