From 646dcbd0edef2d0f231ea1515ce2631eb9edfb64 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 5 Dec 2019 12:12:20 -0800 Subject: [PATCH] Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY Replaced with SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX. Both are set in Intent extras by SubscriptionManager#putPhoneIdAndSubIdExtra. Bug: 140908357 Test: make Change-Id: I54a65ef81acc68c34af6263e929634f15f05e494 --- core/java/android/provider/Telephony.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 5063b2c698a3e..73dd692d97a9b 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -45,7 +45,6 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Patterns; -import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.SmsApplication; import java.lang.annotation.Retention; @@ -1344,7 +1343,7 @@ public final class Telephony { } String format = intent.getStringExtra("format"); - int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY, + int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, SubscriptionManager.getDefaultSmsSubscriptionId()); Rlog.v(TAG, " getMessagesFromIntent sub_id : " + subId);