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

am a541338a: am ec89863a: am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev

Browse Source 
* commit 'a541338a1eaa0fd3ed53c4eaf4be2551ec1a7350':
  Get the MCC/MNC using defaults.
This commit is contained in:
Stuart Scott
2014-09-30 16:12:42 +00:00
committed by Android Git Automerger
parent 9ff903789d a541338a1e
commit 3aacaac344
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 * @see #getSimState
*/ */
public String getSimOperator() { 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); Rlog.d(TAG, "getSimOperator(): default subId=" + subId);
return getSimOperator(subId); return getSimOperator(subId);
} }