am 3fa285f9: Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev (87fba5b6) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -1124,13 +1124,14 @@ public class SubscriptionManager {
		* {@hide}
		*/
		public static int getSimStateForSlotIdx(int slotIdx) {
		int simState;
		int simState = TelephonyManager.SIM_STATE_UNKNOWN;

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