IMS: Notify about change of TTY mode of other call participants (6d91e295) · Commits · e / os / android_frameworks_opt_telephony

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

+33 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ public final class CallManager {
		private static final int EVENT_ONHOLD_TONE = 120;
		// FIXME Taken from klp-sprout-dev but setAudioMode was removed in L.
		//private static final int EVENT_RADIO_OFF_OR_NOT_AVAILABLE = 121;
		private static final int EVENT_TTY_MODE_RECEIVED = 122;

		// Singleton instance
		private static final CallManager INSTANCE = new CallManager();
		@@ -181,6 +182,9 @@ public final class CallManager {
		protected final RegistrantList mPostDialCharacterRegistrants
		= new RegistrantList();

		protected final RegistrantList mTtyModeReceivedRegistrants
		= new RegistrantList();

		private CallManager() {
		mPhones = new ArrayList<Phone>();
		mRingingCalls = new ArrayList<Call>();
		@@ -642,6 +646,7 @@ public final class CallManager {
		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
		phone.registerForOnHoldTone(handler, EVENT_ONHOLD_TONE, null);
		phone.registerForSuppServiceFailed(handler, EVENT_SUPP_SERVICE_FAILED, null);
		phone.registerForTtyModeReceived(handler, EVENT_TTY_MODE_RECEIVED, null);
		}
		}

		@@ -670,6 +675,7 @@ public final class CallManager {
		phone.unregisterForMmiComplete(handler);
		phone.unregisterForSuppServiceFailed(handler);
		phone.unregisterForServiceStateChanged(handler);
		phone.unregisterForTtyModeReceived(handler);
		// FIXME Taken from klp-sprout-dev but setAudioMode was removed in L.
		//phone.unregisterForRadioOffOrNotAvailable(handler);

		@@ -1776,6 +1782,29 @@ public final class CallManager {
		mPostDialCharacterRegistrants.remove(h);
		}

		/**
		* Register for TTY mode change notifications from the network.
		* Message.obj will contain an AsyncResult.
		* AsyncResult.result will be an Integer containing new mode.
		*
		* @param h Handler that receives the notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		public void registerForTtyModeReceived(Handler h, int what, Object obj){
		mTtyModeReceivedRegistrants.addUnique(h, what, obj);
		}

		/**
		* Unregisters for TTY mode change notifications.
		* Extraneous calls are tolerated silently
		*
		* @param h Handler to be removed from the registrant list.
		*/
		public void unregisterForTtyModeReceived(Handler h) {
		mTtyModeReceivedRegistrants.remove(h);
		}

		/* APIs to access foregroudCalls, backgroudCalls, and ringingCalls
		* 1. APIs to access list of calls
		* 2. APIs to check if any active call, which has connection other than
		@@ -2362,6 +2391,10 @@ public final class CallManager {
		if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_ONHOLD_TONE)");
		mOnHoldToneRegistrants.notifyRegistrants((AsyncResult) msg.obj);
		break;
		case EVENT_TTY_MODE_RECEIVED:
		if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_TTY_MODE_RECEIVED)");
		mTtyModeReceivedRegistrants.notifyRegistrants((AsyncResult) msg.obj);
		break;
		/* FIXME Taken from klp-sprout-dev but setAudioMode was removed in L.
		case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:
		if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_RADIO_OFF_OR_NOT_AVAILABLE)");

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -643,6 +643,25 @@ public interface Phone {
		*/
		public void unregisterForSimRecordsLoaded(Handler h);

		/**
		* Register for TTY mode change notifications from the network.
		* Message.obj will contain an AsyncResult.
		* AsyncResult.result will be an Integer containing new mode.
		*
		* @param h Handler that receives the notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		public void registerForTtyModeReceived(Handler h, int what, Object obj);

		/**
		* Unregisters for TTY mode change notifications.
		* Extraneous calls are tolerated silently
		*
		* @param h Handler to be removed from the registrant list.
		*/
		public void unregisterForTtyModeReceived(Handler h);

		/**
		* Returns SIM record load state. Use
		* <code>getSimCard().registerForReady()</code> for change notification.

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -861,6 +861,14 @@ public abstract class PhoneBase extends Handler implements Phone {
		logUnexpectedCdmaMethodCall("unregisterForSimRecordsLoaded");
		}

		@Override
		public void registerForTtyModeReceived(Handler h, int what, Object obj) {
		}

		@Override
		public void unregisterForTtyModeReceived(Handler h) {
		}

		@Override
		public void setNetworkSelectionModeAutomatic(Message response) {
		// wrap the response message in our own message along with

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -648,6 +648,16 @@ public class PhoneProxy extends Handler implements Phone {
		mActivePhone.unregisterForSimRecordsLoaded(h);
		}

		@Override
		public void registerForTtyModeReceived(Handler h, int what, Object obj) {
		mActivePhone.registerForTtyModeReceived(h, what, obj);
		}

		@Override
		public void unregisterForTtyModeReceived(Handler h) {
		mActivePhone.unregisterForTtyModeReceived(h);
		}

		@Override
		public boolean getIccRecordsLoaded() {
		return mIccCardProxy.getIccRecordsLoaded();

src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ abstract class ImsPhoneBase extends PhoneBase {

		private RegistrantList mRingbackRegistrants = new RegistrantList();
		private RegistrantList mOnHoldRegistrants = new RegistrantList();
		private RegistrantList mTtyModeReceivedRegistrants = new RegistrantList();
		private PhoneConstants.State mState = PhoneConstants.State.IDLE;

		public ImsPhoneBase(String name, Context context, PhoneNotifier notifier) {
		@@ -117,6 +118,21 @@ abstract class ImsPhoneBase extends PhoneBase {
		mOnHoldRegistrants.notifyRegistrants(result);
		}

		@Override
		public void registerForTtyModeReceived(Handler h, int what, Object obj){
		mTtyModeReceivedRegistrants.addUnique(h, what, obj);
		}

		@Override
		public void unregisterForTtyModeReceived(Handler h) {
		mTtyModeReceivedRegistrants.remove(h);
		}

		public void onTtyModeReceived(int mode) {
		AsyncResult result = new AsyncResult(null, Integer.valueOf(mode), null);
		mTtyModeReceivedRegistrants.notifyRegistrants(result);
		}

		@Override
		public ServiceState getServiceState() {
		// FIXME: we may need to provide this when data connectivity is lost