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

Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev

Browse Source
This commit is contained in:
Stuart Scott
2014-09-29 21:04:16 +00:00
committed by Android (Google) Code Review
parent 22c8a43452 015f3b464c
commit 38bfcb4aff
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1501,7 +1501,16 @@ public class TelephonyManager {
* @see #getSimState
*/
public String getSimOperator() {
long subId = getDefaultSubscription();
long subId = SubscriptionManager.getDefaultDataSubId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultSmsSubId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultVoiceSubId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultSubId();
}
}
}
Rlog.d(TAG, "getSimOperator(): default subId=" + subId);
return getSimOperator(subId);
}