am 3d4069a2: Allow TTY mode for GSM Phones (0990484c) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/CommandsInterface.java

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1305,18 +1305,25 @@ public interface CommandsInterface {
	void setCdmaSubscription(int cdmaSubscriptionType, Message response);		void setCdmaSubscription(int cdmaSubscriptionType, Message response);

	/**		/**
	* Set the TTY mode for the CDMA phone		* Set the TTY mode
	*		*
	* @param enable is true to enable, false to disable		* @param ttyMode one of the following:
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_OFF}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_FULL}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO}
	* @param response is callback message		* @param response is callback message
	*/		*/
	void setTTYMode(int ttyMode, Message response);		void setTTYMode(int ttyMode, Message response);

	/**		/**
	* Query the TTY mode for the CDMA phone		* Query the TTY mode
	* (AsyncResult)response.obj).result is an int[] with element [0] set to		* (AsyncResult)response.obj).result is an int[] with element [0] set to
	* 0 for disabled, 1 for enabled.		* tty mode:
	*		* - {@link com.android.internal.telephony.Phone#TTY_MODE_OFF}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_FULL}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO}
	* @param response is callback message		* @param response is callback message
	*/		*/
	void queryTTYMode(Message response);		void queryTTYMode(Message response);

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

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1463,9 +1463,11 @@ public interface Phone {
	/**		/**
	* setTTYMode		* setTTYMode
	* sets a TTY mode option.		* sets a TTY mode option.
	*		* @param ttyMode is a one of the following:
	* @param ttyMode is a boolean representing the state that you are		* - {@link com.android.internal.telephony.Phone#TTY_MODE_OFF}
	* requesting, true for enabled, false for disabled.		* - {@link com.android.internal.telephony.Phone#TTY_MODE_FULL}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO}
	* @param onComplete a callback message when the action is completed		* @param onComplete a callback message when the action is completed
	*/		*/
	void setTTYMode(int ttyMode, Message onComplete);		void setTTYMode(int ttyMode, Message onComplete);

telephony/java/com/android/internal/telephony/PhoneBase.java

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -697,13 +697,11 @@ public abstract class PhoneBase extends Handler implements Phone {
	}		}

	public void setTTYMode(int ttyMode, Message onComplete) {		public void setTTYMode(int ttyMode, Message onComplete) {
	// This function should be overridden by the class CDMAPhone. Not implemented in GSMPhone.		mCM.setTTYMode(ttyMode, onComplete);
	logUnexpectedCdmaMethodCall("setTTYMode");
	}		}

	public void queryTTYMode(Message onComplete) {		public void queryTTYMode(Message onComplete) {
	// This function should be overridden by the class CDMAPhone. Not implemented in GSMPhone.		mCM.queryTTYMode(onComplete);
	logUnexpectedCdmaMethodCall("queryTTYMode");
	}		}

	public void enableEnhancedVoicePrivacy(boolean enable, Message onComplete) {		public void enableEnhancedVoicePrivacy(boolean enable, Message onComplete) {

telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1149,20 +1149,6 @@ public class CDMAPhone extends PhoneBase {
	return this.mIccFileHandler;		return this.mIccFileHandler;
	}		}

	/**
	* Set the TTY mode of the CDMAPhone
	*/
	public void setTTYMode(int ttyMode, Message onComplete) {
	this.mCM.setTTYMode(ttyMode, onComplete);
	}

	/**
	* Queries the TTY mode of the CDMAPhone
	*/
	public void queryTTYMode(Message onComplete) {
	this.mCM.queryTTYMode(onComplete);
	}

	/**		/**
	* Activate or deactivate cell broadcast SMS.		* Activate or deactivate cell broadcast SMS.
	*		*

telephony/java/com/android/internal/telephony/test/SimulatedCommands.java

+13 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1402,23 +1402,28 @@ public final class SimulatedCommands extends BaseCommands
	}		}

	/**		/**
	* Set the TTY mode for the CDMA phone		* Set the TTY mode
	*		*
	* @param enable is true to enable, false to disable		* @param ttyMode is one of the following:
	* @param serviceClass is a sum of SERVICE_CLASS_*		* - {@link com.android.internal.telephony.Phone#TTY_MODE_OFF}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_FULL}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO}
	* @param response is callback message		* @param response is callback message
	*/		*/
	public void setTTYMode(int ttyMode, Message response) {		public void setTTYMode(int ttyMode, Message response) {
	Log.w(LOG_TAG, "CDMA not implemented in SimulatedCommands");		Log.w(LOG_TAG, "Not implemented in SimulatedCommands");
	unimplemented(response);		unimplemented(response);
	}		}

	/**		/**
	* Query the TTY mode for the CDMA phone		* Query the TTY mode
	* (AsyncResult)response.obj).result is an int[] with element [0] set to		* (AsyncResult)response.obj).result is an int[] with element [0] set to
	* 0 for disabled, 1 for enabled.		* tty mode:
	*		* - {@link com.android.internal.telephony.Phone#TTY_MODE_OFF}
	* @param serviceClass is a sum of SERVICE_CLASS_*		* - {@link com.android.internal.telephony.Phone#TTY_MODE_FULL}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO}
			* - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO}
	* @param response is callback message		* @param response is callback message
	*/		*/
	public void queryTTYMode(Message response) {		public void queryTTYMode(Message response) {