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" am: 87a336846e

Browse Source 
am: 44dc116739

Change-Id: I16df51378764d9d62abe8c87c242e5a3a6c3b8ba
This commit is contained in:
Pengquan Meng
2017-11-02 03:06:22 +00:00
committed by android-build-merger
parent 4d9005226c 44dc116739
commit 402f64313e
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

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