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

Commit bacaf9d9 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "fix the issue of carrie id dumpsys" am: a4191860 am: 01dcfa66 

am: 7ff62eb9

Change-Id: Iab6ce8f2646f6e98a02476b75411b5371b76487e
parents 514f78de 7ff62eb9

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

+1 −1
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ public class CarrierResolver extends Handler { 
        ipw.println("mMnoCarrierId: " + mMnoCarrierId);

        ipw.println("mCarrierName: " + mCarrierName);

        ipw.println("mPreciseCarrierName: " + mPreciseCarrierName);

        ipw.println("version: " + getCarrierListVersion());

        ipw.println("carrier_list_version: " + getCarrierListVersion());



        ipw.println("mCarrierMatchingRules on mccmnc: "

                + mTelephonyMgr.getSimOperatorNumericForPhone(mPhone.getPhoneId()));

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

+0 −2
Original line number Diff line number Diff line
@@ -175,8 +175,6 @@ public class GsmCdmaPhone extends Phone { 
    public EmergencyNumberTracker mEmergencyNumberTracker;

    private ArrayList <MmiCode> mPendingMMIs = new ArrayList<MmiCode>();

    private IccPhoneBookInterfaceManager mIccPhoneBookIntManager;

    // Used for identify the carrier of current subscription

    private CarrierResolver mCarrierResolver;



    private int mPrecisePhoneType;

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

+13 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    protected DeviceStateMonitor mDeviceStateMonitor;

    protected TransportManager mTransportManager;

    protected DataEnabledSettings mDataEnabledSettings;

    // Used for identify the carrier of current subscription

    protected CarrierResolver mCarrierResolver;



    protected int mPhoneId;
@@ -3954,6 +3956,17 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            pw.println("++++++++++++++++++++++++++++++++");

        }



        if (mCarrierResolver != null) {

            try {

                mCarrierResolver.dump(fd, pw, args);

            } catch (Exception e) {

                e.printStackTrace();

            }



            pw.flush();

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

        }



        if (mCarrierActionAgent != null) {

            try {

                mCarrierActionAgent.dump(fd, pw, args);