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

Get the MCC/MNC using defaults.

Browse Source 
First try default data, then default sms, then default voice, finally
try the first sub to come up.

bug: 17396869
Change-Id: I09da19b7b25c2a6aa8affd95847dbb10e039f634
This commit is contained in:
Stuart Scott
2014-09-26 21:46:39 -07:00
parent df44f76444
commit 015f3b464c
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);
}