diff options
| author | Meng Wang <mewan@google.com> | 2019-12-05 15:33:29 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-05 15:33:29 -0800 |
| commit | cb0d068f28360ac356cf2f7e8333ad52d1489f22 (patch) | |
| tree | 1e782dd883064b6cdc4ff546f311d5bed5da9817 /core/java | |
| parent | 0bcd4fc5b3ed94b065722b617864f92b639a5d7c (diff) | |
| parent | ddf215dd5882c91462c2e4b181d69f88452f4f80 (diff) | |
Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY"
am: ddf215dd58
Change-Id: I68194558a0266cabedf81cdf43b73dba69d02779
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Telephony.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index e80df2ddd010..ebdde0a54a86 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); |