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

Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev

Browse Source
This commit is contained in:
Sanket Padawe
2015-06-18 19:42:49 +00:00
committed by Android (Google) Code Review
parent aa2a19661d 330dcac0cb
commit 3fa285f93e
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/SubscriptionManager.java
View File

@@ -1124,13 +1124,14 @@ public class SubscriptionManager {
* {@hide} * {@hide}
*/ */
public static int getSimStateForSlotIdx(int slotIdx) { public static int getSimStateForSlotIdx(int slotIdx) {
int simState; int simState = TelephonyManager.SIM_STATE_UNKNOWN;
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
simState = iSub.getSimStateForSlotIdx(slotIdx); if (iSub != null) {
simState = iSub.getSimStateForSlotIdx(slotIdx);
}
} catch (RemoteException ex) { } catch (RemoteException ex) {
simState = TelephonyManager.SIM_STATE_UNKNOWN;
} }
logd("getSimStateForSubscriber: simState=" + simState + " slotIdx=" + slotIdx); logd("getSimStateForSubscriber: simState=" + simState + " slotIdx=" + slotIdx);
return simState; return simState;
@@ -1144,7 +1145,9 @@ public class SubscriptionManager {
public boolean isActiveSubId(int subId) { public boolean isActiveSubId(int subId) {
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
return iSub.isActiveSubId(subId); if (iSub != null) {
return iSub.isActiveSubId(subId);
}
} catch (RemoteException ex) { } catch (RemoteException ex) {
} }
return false; return false;