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

Commit 502bb1c2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed SIM issues"

parents b92b7793 eb223233

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ import com.android.internal.telephony.data.DataNetworkController; 
import com.android.internal.telephony.data.LinkBandwidthEstimator;

import com.android.internal.telephony.domainselection.DomainSelectionResolver;

import com.android.internal.telephony.emergency.EmergencyNumberTracker;

import com.android.internal.telephony.emergency.EmergencyStateTracker;

import com.android.internal.telephony.gsm.GsmMmiCode;

import com.android.internal.telephony.gsm.SsData;

import com.android.internal.telephony.gsm.SuppServiceNotification;
@@ -4827,6 +4826,8 @@ public class GsmCdmaPhone extends Phone { 
                    IccUtils.stripTrailingFs(iccId));

        }



        logd("reapplyUiccAppsEnablementIfNeeded: retries=" + retries + ", subInfo=" + info);



        // If info is null, it could be a new subscription. By default we enable it.

        boolean expectedValue = info == null || info.areUiccApplicationsEnabled();

src/java/com/android/internal/telephony/PhoneFactory.java

+1 −3
Original line number Diff line number Diff line
@@ -611,9 +611,7 @@ public class PhoneFactory { 
        pw.decreaseIndent();

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



        if (isSubscriptionManagerServiceEnabled()) {

            SubscriptionManagerService.getInstance().dump(fd, pw, args);

        } else {

        if (!isSubscriptionManagerServiceEnabled()) {

            pw.println("SubscriptionController:");

            pw.increaseIndent();

            try {

src/java/com/android/internal/telephony/RIL.java

+2 −1
Original line number Diff line number Diff line
@@ -4887,7 +4887,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    mRILDefaultWorkSource);



            if (RILJ_LOGD) {

                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));

                riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest)

                        + " " + enable);

            }



            try {

src/java/com/android/internal/telephony/ServiceStateTracker.java

+5 −3
Original line number Diff line number Diff line
@@ -2750,9 +2750,11 @@ public class ServiceStateTracker extends Handler { 
            mPhone.getContext().sendStickyBroadcastAsUser(intent, UserHandle.ALL);



            if (mPhone.isSubscriptionManagerServiceEnabled()) {

                mSubscriptionManagerService.setCarrierName(mPhone.getSubId(),

                        TextUtils.emptyIfNull(getCarrierName(data.shouldShowPlmn(), data.getPlmn(),

                if (SubscriptionManager.isValidSubscriptionId(subId)) {

                    mSubscriptionManagerService.setCarrierName(subId, TextUtils.emptyIfNull(

                            getCarrierName(data.shouldShowPlmn(), data.getPlmn(),

                                    data.shouldShowSpn(), data.getSpn())));

                }

            } else {

                if (!mSubscriptionController.setPlmnSpn(mPhone.getPhoneId(),

                        data.shouldShowPlmn(), data.getPlmn(), data.shouldShowSpn(),

src/java/com/android/internal/telephony/metrics/DataCallSessionStats.java

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.telephony.Annotation.NetworkType; 
import android.telephony.DataFailCause;

import android.telephony.ServiceState;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.telephony.data.ApnSetting.ProtocolType;
@@ -270,7 +271,7 @@ public class DataCallSessionStats { 
            subInfo = SubscriptionController.getInstance()

                    .getSubscriptionInfo(mPhone.getSubId());

        }

        if (mPhone.getSubId() != SubscriptionController.getInstance().getDefaultDataSubId()

        if (mPhone.getSubId() != SubscriptionManager.getDefaultDataSubscriptionId()

                && ((mDataCallSession.apnTypeBitmask & ApnSetting.TYPE_DEFAULT)

                == ApnSetting.TYPE_DEFAULT)

                && subInfo != null && !subInfo.isOpportunistic()) {