Merge "Fail SmsManager requests if SubId is not active." into m-wireless-dev (712cdaf4) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1133,5 +1133,19 @@ public class SubscriptionManager {
	logd("getSimStateForSubscriber: simState=" + simState + " subId=" + subId);		logd("getSimStateForSubscriber: simState=" + simState + " subId=" + subId);
	return simState;		return simState;
	}		}

			/**
			* @return true if the sub ID is active. i.e. The sub ID corresponds to a known subscription
			* and the SIM providing the subscription is present in a slot and in "LOADED" state.
			* @hide
			*/
			public boolean isActiveSubId(int subId) {
			try {
			ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
			return iSub.isActiveSubId(subId);
			} catch (RemoteException ex) {
			}
			return false;
			}
	}		}

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -171,4 +171,5 @@ interface ISub {
	*/		*/
	int getSimStateForSubscriber(int subId);		int getSimStateForSubscriber(int subId);

			boolean isActiveSubId(int subId);
	}		}