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

Merge "Fix getSimOperator to return mccmnc based on subId"

Browse Source 
am: 87a336846e

Change-Id: Id0de42b730ca4941e1436e959604a28296508b03
This commit is contained in:
Pengquan Meng
2017-11-02 01:21:11 +00:00
committed by android-build-merger
parent 7f25f6d720 87a336846e
commit 44dc116739
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -2133,13 +2133,16 @@ public class TelephonyManager {
* @hide * @hide
*/ */
public String getSimOperatorNumeric() { public String getSimOperatorNumeric() {
int subId = SubscriptionManager.getDefaultDataSubscriptionId(); int subId = mSubId;
if (!SubscriptionManager.isUsableSubIdValue(subId)) { if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultSmsSubscriptionId(); subId = SubscriptionManager.getDefaultDataSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) { if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultVoiceSubscriptionId(); subId = SubscriptionManager.getDefaultSmsSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) { if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultSubscriptionId(); subId = SubscriptionManager.getDefaultVoiceSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultSubscriptionId();
}
} }
} }
} }