Merge "Add new method for getCdmaSubscriptionMode" am: 7e58cb94b3 (a29f3a4d) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/Phone.java

+16 −7

Original line number	Diff line number	Diff line
		@@ -2130,14 +2130,23 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		}

		/**
		* Query the CDMA roaming preference setting
		* Query the CDMA roaming preference setting.
		*
		* @param response is callback message to report one of CDMA_RM_*
		* @param response is callback message to report one of TelephonyManager#CDMA_ROAMING_MODE_*
		*/
		public void queryCdmaRoamingPreference(Message response) {
		mCi.queryCdmaRoamingPreference(response);
		}

		/**
		* Get the CDMA subscription mode setting.
		*
		* @param response is callback message to report one of TelephonyManager#CDMA_SUBSCRIPTION_*
		*/
		public void queryCdmaSubscriptionMode(Message response) {
		mCi.getCdmaSubscriptionSource(response);
		}

		/**
		* Get current signal strength. No change notification available on this
		* interface. Use <code>PhoneStateNotifier</code> or an equivalent.
		@@ -2168,7 +2177,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {

		/**
		* Requests to set the CDMA roaming preference
		* @param cdmaRoamingType one of CDMA_RM_*
		* @param cdmaRoamingType one of TelephonyManager#CDMA_ROAMING_MODE_*
		* @param response is callback message
		*/
		public void setCdmaRoamingPreference(int cdmaRoamingType, Message response) {
		@@ -2177,10 +2186,10 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {

		/**
		* Requests to set the CDMA subscription mode
		* @param cdmaSubscriptionType one of CDMA_SUBSCRIPTION_*
		* @param cdmaSubscriptionType one of TelephonyManager#CDMA_SUBSCRIPTION_*
		* @param response is callback message
		*/
		public void setCdmaSubscription(int cdmaSubscriptionType, Message response) {
		public void setCdmaSubscriptionMode(int cdmaSubscriptionType, Message response) {
		mCi.setCdmaSubscriptionSource(cdmaSubscriptionType, response);
		}