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

Merge "Return reasonable phone type if no sim inserted." into mnc-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2015-06-23 00:33:13 +00:00
committed by Android (Google) Code Review
parent a2cbb3e632 d314de0aa4
commit 0c5c8570dc
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -944,10 +944,17 @@ public class TelephonyManager {
/** {@hide} */ /** {@hide} */
@SystemApi @SystemApi
public int getCurrentPhoneType(int subId) { public int getCurrentPhoneType(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId;
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
// if we don't have any sims, we don't have subscriptions, but we
// still may want to know what type of phone we've got.
phoneId = 0;
} else {
phoneId = SubscriptionManager.getPhoneId(subId);
}
try{ try{
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null && subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
return telephony.getActivePhoneTypeForSubscriber(subId); return telephony.getActivePhoneTypeForSubscriber(subId);
} else { } else {
// This can happen when the ITelephony interface is not up yet. // This can happen when the ITelephony interface is not up yet.