Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" am: ddf215dd58 am: cb0d068f28

Browse Source 
am: 4f47555359

Change-Id: Iafa9facfbb0759916cd414b23da19f9a3c367a55
This commit is contained in:
Meng Wang
2019-12-06 00:25:55 -08:00
committed by android-build-merger
parent 9decfa4798 4f47555359
commit 0bcd19acdb
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/provider/Telephony.java
View File

@@ -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);