Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bcd19ac authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" am: ddf215dd am: cb0d068f 

am: 4f475553

Change-Id: Iafa9facfbb0759916cd414b23da19f9a3c367a55
parents 9decfa47 4f475553

core/java/android/provider/Telephony.java

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,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;
@@ -1379,7 +1378,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);