summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMeng Wang <mewan@google.com>2019-12-05 12:12:20 -0800
committerMeng Wang <mewan@google.com>2019-12-05 12:12:20 -0800
commit646dcbd0edef2d0f231ea1515ce2631eb9edfb64 (patch)
tree17fd1d93cf53dfb8c965e8dd398b84a33c73decc /core/java
parent4d1971e8807fbb285d61b89931f9362b8bbbdc57 (diff)
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
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Telephony.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 5063b2c698a3..73dd692d97a9 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);