MSIM: voice/sms subscription related API changes. (1c40482e) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+47 −0

Original line number	Diff line number	Diff line
		@@ -791,6 +791,30 @@ public class SubscriptionManager implements BaseColumns {
		return getPhoneId(getDefaultVoiceSubId());
		}

		public static boolean isSMSPromptEnabled() {
		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		return iSub.isSMSPromptEnabled();
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		return false;
		}

		public static void setSMSPromptEnabled(boolean enabled) {
		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		iSub.setSMSPromptEnabled(enabled);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		}

		/** @hide */
		/**
		* @return subId of the DefaultSms subscription or the value INVALID_SUB_ID if an error.
		* @hide - to be unhidden
		@@ -990,5 +1014,28 @@ public class SubscriptionManager implements BaseColumns {
		return subId;

		}

		public static boolean isVoicePromptEnabled() {
		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		return iSub.isVoicePromptEnabled();
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		return false;
		}

		public static void setVoicePromptEnabled(boolean enabled) {
		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		iSub.setVoicePromptEnabled(enabled);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		}
		}

+0 −12

Original line number	Diff line number	Diff line
		@@ -553,12 +553,6 @@ interface ISms {
		*/
		boolean isImsSmsSupportedForSubscriber(long subId);

		/*
		* get user prefered SMS subId
		* @return subId id
		*/
		long getPreferredSmsSubscription();

		/**
		* Gets SMS format supported on IMS. SMS over IMS format is
		* either 3GPP or 3GPP2.
		@@ -583,12 +577,6 @@ interface ISms {
		*/
		String getImsSmsFormatForSubscriber(long subId);

		/*
		* Get SMS prompt property, enabled or not
		* @return true if enabled, false otherwise
		*/
		boolean isSMSPromptEnabled();

		/**
		* Send a system stored text message.
		*

+8 −0

Original line number	Diff line number	Diff line
		@@ -151,4 +151,12 @@ interface ISub {
		void clearDefaultsForInactiveSubIds();

		long[] getActiveSubIdList();

		boolean isSMSPromptEnabled();

		void setSMSPromptEnabled(boolean enabled);

		boolean isVoicePromptEnabled();

		void setVoicePromptEnabled(boolean enabled);
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,10 @@ public class PhoneConstants {
		public static final int SIM_ID_3 = 2;
		public static final int SIM_ID_4 = 3;

		public static final int PHONE_ID1 = 0;
		public static final int PHONE_ID2 = 1;
		public static final int PHONE_ID3 = 2;

		// ICC SIM Application Types
		// TODO: Replace the IccCardApplicationStatus.AppType enums with these constants
		public static final int APPTYPE_UNKNOWN = 0;