Merge "add setCdmaSubscription to telephonymanager." (2416bab7) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -2792,6 +2792,25 @@ public class TelephonyManager {
		return false;
		}

		/**
		* Set the CDMA subscription source.
		* Used for device supporting both NV and RUIM for CDMA.
		*
		* @param subscriptionType the subscription type, 0 for RUIM, 1 for NV.
		* @return true on success; false on any failure.
		* @hide
		*/
		public boolean setCdmaSubscription(int subscriptionType) {
		try {
		return getITelephony().setCdmaSubscription(subscriptionType);
		} catch (RemoteException ex) {
		Rlog.e(TAG, "setCdmaSubscription RemoteException", ex);
		} catch (NullPointerException ex) {
		Rlog.e(TAG, "setCdmaSubscription NPE", ex);
		}
		return false;
		}

		/**
		* Expose the rest of ITelephony to @SystemApi
		*/

+9 −0

Original line number	Diff line number	Diff line
		@@ -605,6 +605,15 @@ interface ITelephony {
		*/
		boolean setPreferredNetworkType(int networkType);

		/**
		* Set the CDMA subscription source.
		* Used for device supporting both NV and RUIM for CDMA.
		*
		* @param subscriptionType the subscription type, 0 for RUIM, 1 for NV.
		* @return true on success; false on any failure.
		*/
		boolean setCdmaSubscription(int subscriptionType);

		/**
		* User enable/disable Mobile Data.
		*