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

Commit c3c594eb authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Enhance adding subscription info logs"

parents ad228a6d 2b89f013

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

+4 −1
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ public class SubscriptionController extends ISub.Stub { 
    private static int mDefaultPhoneId = SubscriptionManager.DEFAULT_PHONE_INDEX;



    private int[] colorArr;

    private long mLastISubServiceRegTime;



    public static SubscriptionController init(Phone phone) {

        synchronized (SubscriptionController.class) {
@@ -208,6 +209,7 @@ public class SubscriptionController extends ISub.Stub { 


        if(ServiceManager.getService("isub") == null) {

            ServiceManager.addService("isub", this);

            mLastISubServiceRegTime = System.currentTimeMillis();

        }



        if (DBG) logdl("[SubscriptionController] init by Context");
@@ -2135,6 +2137,7 @@ public class SubscriptionController extends ISub.Stub { 
        final long token = Binder.clearCallingIdentity();

        try {

            pw.println("SubscriptionController:");

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

            pw.println(" defaultSubId=" + getDefaultSubId());

            pw.println(" defaultDataSubId=" + getDefaultDataSubId());

            pw.println(" defaultVoiceSubId=" + getDefaultVoiceSubId());

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

+2 −0
Original line number Diff line number Diff line
@@ -612,6 +612,8 @@ public class SubscriptionInfoUpdater extends Handler { 
                            + Integer.toString(mInsertSimState[i]), i);

                    logd("SUB" + (i + 1) + " has invalid IccId");

                } else /*if (sInsertSimState[i] != SIM_NOT_INSERT)*/ {

                    logd("updateSubscriptionInfoByIccId: adding subscription info record: iccid: "

                            + mIccId[i] + "slot: " + i);

                    mSubscriptionManager.addSubscriptionInfoRecord(mIccId[i], i);

                }

                if (isNewSim(mIccId[i], decIccId[i], oldIccId)) {