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

Commit 3bf1df9c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5879506 from b4f332e6 to qt-qpr1-release 

Change-Id: Ibcf51590e2344bb61d24faac758c57b36b92bd5f
parents ae53d1b8 b4f332e6

src/java/com/android/internal/telephony/dataconnection/ApnSettingUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ public class ApnSettingUtils { 
     */

    public static boolean mvnoMatches(IccRecords r, int mvnoType, String mvnoMatchData) {

        if (mvnoType == ApnSetting.MVNO_TYPE_SPN) {

            if ((r.getServiceProviderName() != null)

                    && r.getServiceProviderName().equalsIgnoreCase(mvnoMatchData)) {

            String spn = r.getServiceProviderNameWithBrandOverride();

            if ((spn != null) && spn.equalsIgnoreCase(mvnoMatchData)) {

                return true;

            }

        } else if (mvnoType == ApnSetting.MVNO_TYPE_IMSI) {

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

+18 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.telephony.uicc;



import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.AsyncResult;
@@ -694,6 +695,23 @@ public abstract class IccRecords extends Handler implements IccConstants { 
        return mSpn;

    }



    /**

     * Return Service Provider Name stored in SIM (EF_SPN=0x6F46) or in RUIM (EF_RUIM_SPN=0x6F41) or

     * the brand override. The brand override has higher priority than the SPN from SIM.

     *

     * @return service provider name.

     */

    @Nullable

    public String getServiceProviderNameWithBrandOverride() {

        if (mParentApp != null && mParentApp.getUiccProfile() != null) {

            String brandOverride = mParentApp.getUiccProfile().getOperatorBrandOverride();

            if (!TextUtils.isEmpty(brandOverride)) {

                return brandOverride;

            }

        }

        return mSpn;

    }



    protected void setServiceProviderName(String spn) {

        if (!TextUtils.equals(mSpn, spn)) {

            mSpn = spn != null ? spn.trim() : null;

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

+7 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class UiccSlot extends Handler { 
    private int mLastRadioState = TelephonyManager.RADIO_POWER_UNAVAILABLE;

    private boolean mIsEuicc;

    private String mIccId;

    private String mEid;

    private AnswerToReset mAtr;

    private int mPhoneId = INVALID_PHONE_ID;

    private boolean mIsRemovable;
@@ -145,6 +146,7 @@ public class UiccSlot extends Handler { 
            parseAtr(iss.atr);

            mCardState = iss.cardState;

            mIccId = iss.iccid;

            mEid = iss.eid;

            mIsRemovable = isSlotRemovable(slotIndex);

            if (iss.slotState == IccSlotStatus.SlotState.SLOTSTATE_INACTIVE) {

                // TODO: (b/79432584) evaluate whether should broadcast card state change
@@ -271,6 +273,10 @@ public class UiccSlot extends Handler { 
        }

    }



    public String getEid() {

        return mEid;

    }



    public boolean isExtendedApduSupported() {

        return  (mAtr != null && mAtr.isExtendedApduSupported());

    }
@@ -424,6 +430,7 @@ public class UiccSlot extends Handler { 
        pw.println(" mIsEuicc=" + mIsEuicc);

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

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

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

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

        if (mUiccCard != null) {

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