summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-10 20:45:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-10 20:45:04 +0000
commit9ee00065737ea89338163d0a17f592fce23f9c09 (patch)
treec19be7eb997f15fef32181eded8f1eca36bec722
parentdd475a2bc6749c249d2cba0f5310d67efabeb35f (diff)
parent451a27e3e945671fcd1b3dbf90bf6608d4d29e17 (diff)
Merge "Remove hidden API usage: PhoneConstants.PHONE_KEY" am: 0f0a97368a am: 451a27e3e9
Change-Id: I69eab9f3be406621d1a90f86ee17449b46b6cbb3
-rw-r--r--services/core/java/com/android/server/TelephonyRegistry.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 226a363badba..40bde9a35e8a 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -358,7 +358,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
SubscriptionManager.getDefaultSubscriptionId());
int newDefaultPhoneId = intent.getIntExtra(
- PhoneConstants.PHONE_KEY,
+ SubscriptionManager.EXTRA_SLOT_INDEX,
SubscriptionManager.getPhoneId(newDefaultSubId));
if (DBG) {
log("onReceive:current mDefaultSubId=" + mDefaultSubId