commit 0bd6a7697886369adbac9af85117deea37c3c5a8
author Nathan Harold <nharold@google.com> Tue May 14 13:10:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 14 13:10:49 2019 -0700
tree 032edfc99b67b1a59209efbeebf7d63e46039fcd
parent 957e6468235270806ce8a2f13e59738d55e7772a
parent 686ef19fd77a5818c15d6cf30488b4ee2ee47607

Merge "listen to correct intent extra for defaultSubIdChange"
am: 686ef19fd7

Change-Id: I773b4ed86583503df81c2e43b54b18aef78d8dd3

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

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index a172fde..75b5e88 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -342,7 +342,7 @@
                 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
@@ -1924,8 +1924,8 @@
             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();