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

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

Merge "listen to correct intent extra for defaultSubIdChange" into qt-dev 

am: 9bac8d52

Change-Id: Ided01614437514b799d1a91702eaec2c0e8b6eac
parents 26064add 9bac8d52

services/core/java/com/android/server/TelephonyRegistry.java

+3 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                Integer newDefaultSubIdObj = new Integer(intent.getIntExtra(

                        PhoneConstants.SUBSCRIPTION_KEY,

                        SubscriptionManager.getDefaultSubscriptionId()));

                int newDefaultPhoneId = intent.getIntExtra(PhoneConstants.SLOT_KEY,

                int newDefaultPhoneId = intent.getIntExtra(PhoneConstants.PHONE_KEY,

                    SubscriptionManager.getPhoneId(mDefaultSubId));

                if (DBG) {

                    log("onReceive:current mDefaultSubId=" + mDefaultSubId
@@ -1935,8 +1935,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            pw.println("mEmergencyNumberList=" + mEmergencyNumberList);

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

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

            pw.println("mDefaultPhoneId" + mDefaultPhoneId);

            pw.println("mDefaultSubId" + mDefaultSubId);

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

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



            pw.decreaseIndent();