From addc27001e2a6512cfb3422b687986ecc7104ade Mon Sep 17 00:00:00 2001 From: chen xu Date: Tue, 7 May 2019 16:25:12 -0700 Subject: [PATCH] listen to correct intent extra for defaultSubIdChange TelephonyRegistry listen for the wrong intent extra PhoneConstants.SLOT which has been removed recently. Thus when receive default subscription id changed event, we mistenkenly thought phone ID is invalid, thus we never update mDefaultPhoneId and mDefaultSubId and fails to notify listeners on default subscription Bug: 131915645 Test: Manual Change-Id: Ibb79e55c0756b30669cbd5c69c181f9f9c4d186b --- .../core/java/com/android/server/TelephonyRegistry.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 28bc34859e6c9..225c08092b496 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -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();