Merge "Create and track different Handler instances for each Phone." into lmp-dev (8574e746) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+69 −43

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@ import android.telephony.Rlog;

	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.Collections;		import java.util.Collections;
			import java.util.HashMap;
	import java.util.List;		import java.util.List;


	@@ -101,6 +102,9 @@ public final class CallManager {
	// empty connection list		// empty connection list
	private final ArrayList<Connection> mEmptyConnections = new ArrayList<Connection>();		private final ArrayList<Connection> mEmptyConnections = new ArrayList<Connection>();

			// mapping of phones to registered handler instances used for callbacks from RIL
			private final HashMap<Phone, CallManagerHandler> mHandlerMap = new HashMap<>();

	// default phone as the first phone registered, which is PhoneBase obj		// default phone as the first phone registered, which is PhoneBase obj
	private Phone mDefaultPhone;		private Phone mDefaultPhone;

	@@ -506,61 +510,84 @@ public final class CallManager {
	}		}

	private void registerForPhoneStates(Phone phone) {		private void registerForPhoneStates(Phone phone) {
			// We need to keep a mapping of handler to Phone for proper unregistration.
			// TODO: Clean up this solution as it is just a work around for each Phone instance
			// using the same Handler to register with the RIL. When time permits, we should consider
			// moving the handler (or the reference ot the handler) into the Phone object.
			// See b/17414427.
			CallManagerHandler handler = mHandlerMap.get(phone);
			if (handler != null) {
			Rlog.d(LOG_TAG, "This phone has already been registered.");
			return;
			}

			// New registration, create a new handler instance and register the phone.
			handler = new CallManagerHandler();
			mHandlerMap.put(phone, handler);

	// for common events supported by all phones		// for common events supported by all phones
	phone.registerForPreciseCallStateChanged(mHandler, EVENT_PRECISE_CALL_STATE_CHANGED, null);		phone.registerForPreciseCallStateChanged(handler, EVENT_PRECISE_CALL_STATE_CHANGED, null);
	phone.registerForDisconnect(mHandler, EVENT_DISCONNECT, null);		phone.registerForDisconnect(handler, EVENT_DISCONNECT, null);
	phone.registerForNewRingingConnection(mHandler, EVENT_NEW_RINGING_CONNECTION, null);		phone.registerForNewRingingConnection(handler, EVENT_NEW_RINGING_CONNECTION, null);
	phone.registerForUnknownConnection(mHandler, EVENT_UNKNOWN_CONNECTION, null);		phone.registerForUnknownConnection(handler, EVENT_UNKNOWN_CONNECTION, null);
	phone.registerForIncomingRing(mHandler, EVENT_INCOMING_RING, null);		phone.registerForIncomingRing(handler, EVENT_INCOMING_RING, null);
	phone.registerForRingbackTone(mHandler, EVENT_RINGBACK_TONE, null);		phone.registerForRingbackTone(handler, EVENT_RINGBACK_TONE, null);
	phone.registerForInCallVoicePrivacyOn(mHandler, EVENT_IN_CALL_VOICE_PRIVACY_ON, null);		phone.registerForInCallVoicePrivacyOn(handler, EVENT_IN_CALL_VOICE_PRIVACY_ON, null);
	phone.registerForInCallVoicePrivacyOff(mHandler, EVENT_IN_CALL_VOICE_PRIVACY_OFF, null);		phone.registerForInCallVoicePrivacyOff(handler, EVENT_IN_CALL_VOICE_PRIVACY_OFF, null);
	phone.registerForDisplayInfo(mHandler, EVENT_DISPLAY_INFO, null);		phone.registerForDisplayInfo(handler, EVENT_DISPLAY_INFO, null);
	phone.registerForSignalInfo(mHandler, EVENT_SIGNAL_INFO, null);		phone.registerForSignalInfo(handler, EVENT_SIGNAL_INFO, null);
	phone.registerForResendIncallMute(mHandler, EVENT_RESEND_INCALL_MUTE, null);		phone.registerForResendIncallMute(handler, EVENT_RESEND_INCALL_MUTE, null);
	phone.registerForMmiInitiate(mHandler, EVENT_MMI_INITIATE, null);		phone.registerForMmiInitiate(handler, EVENT_MMI_INITIATE, null);
	phone.registerForMmiComplete(mHandler, EVENT_MMI_COMPLETE, null);		phone.registerForMmiComplete(handler, EVENT_MMI_COMPLETE, null);
	phone.registerForSuppServiceFailed(mHandler, EVENT_SUPP_SERVICE_FAILED, null);		phone.registerForSuppServiceFailed(handler, EVENT_SUPP_SERVICE_FAILED, null);
	phone.registerForServiceStateChanged(mHandler, EVENT_SERVICE_STATE_CHANGED, null);		phone.registerForServiceStateChanged(handler, EVENT_SERVICE_STATE_CHANGED, null);

	// for events supported only by GSM, CDMA and IMS phone		// for events supported only by GSM, CDMA and IMS phone
	if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM \|\|		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM \|\|
	phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA \|\|		phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA \|\|
	phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {		phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
	phone.setOnPostDialCharacter(mHandler, EVENT_POST_DIAL_CHARACTER, null);		phone.setOnPostDialCharacter(handler, EVENT_POST_DIAL_CHARACTER, null);
	}		}

	// for events supported only by CDMA phone		// for events supported only by CDMA phone
	if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ){		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ){
	phone.registerForCdmaOtaStatusChange(mHandler, EVENT_CDMA_OTA_STATUS_CHANGE, null);		phone.registerForCdmaOtaStatusChange(handler, EVENT_CDMA_OTA_STATUS_CHANGE, null);
	phone.registerForSubscriptionInfoReady(mHandler, EVENT_SUBSCRIPTION_INFO_READY, null);		phone.registerForSubscriptionInfoReady(handler, EVENT_SUBSCRIPTION_INFO_READY, null);
	phone.registerForCallWaiting(mHandler, EVENT_CALL_WAITING, null);		phone.registerForCallWaiting(handler, EVENT_CALL_WAITING, null);
	phone.registerForEcmTimerReset(mHandler, EVENT_ECM_TIMER_RESET, null);		phone.registerForEcmTimerReset(handler, EVENT_ECM_TIMER_RESET, null);
	}		}

	// for events supported only by IMS phone		// for events supported only by IMS phone
	if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
	phone.registerForOnHoldTone(mHandler, EVENT_ONHOLD_TONE, null);		phone.registerForOnHoldTone(handler, EVENT_ONHOLD_TONE, null);
	}		}
	}		}

	private void unregisterForPhoneStates(Phone phone) {		private void unregisterForPhoneStates(Phone phone) {
			// Make sure that we clean up our map of handlers to Phones.
			CallManagerHandler handler = mHandlerMap.get(phone);
			if (handler != null) {
			Rlog.e(LOG_TAG, "Could not find Phone handler for unregistration");
			return;
			}
			mHandlerMap.remove(phone);

	// for common events supported by all phones		// for common events supported by all phones
	phone.unregisterForPreciseCallStateChanged(mHandler);		phone.unregisterForPreciseCallStateChanged(handler);
	phone.unregisterForDisconnect(mHandler);		phone.unregisterForDisconnect(handler);
	phone.unregisterForNewRingingConnection(mHandler);		phone.unregisterForNewRingingConnection(handler);
	phone.unregisterForUnknownConnection(mHandler);		phone.unregisterForUnknownConnection(handler);
	phone.unregisterForIncomingRing(mHandler);		phone.unregisterForIncomingRing(handler);
	phone.unregisterForRingbackTone(mHandler);		phone.unregisterForRingbackTone(handler);
	phone.unregisterForInCallVoicePrivacyOn(mHandler);		phone.unregisterForInCallVoicePrivacyOn(handler);
	phone.unregisterForInCallVoicePrivacyOff(mHandler);		phone.unregisterForInCallVoicePrivacyOff(handler);
	phone.unregisterForDisplayInfo(mHandler);		phone.unregisterForDisplayInfo(handler);
	phone.unregisterForSignalInfo(mHandler);		phone.unregisterForSignalInfo(handler);
	phone.unregisterForResendIncallMute(mHandler);		phone.unregisterForResendIncallMute(handler);
	phone.unregisterForMmiInitiate(mHandler);		phone.unregisterForMmiInitiate(handler);
	phone.unregisterForMmiComplete(mHandler);		phone.unregisterForMmiComplete(handler);
	phone.unregisterForSuppServiceFailed(mHandler);		phone.unregisterForSuppServiceFailed(handler);
	phone.unregisterForServiceStateChanged(mHandler);		phone.unregisterForServiceStateChanged(handler);

	// for events supported only by GSM, CDMA and IMS phone		// for events supported only by GSM, CDMA and IMS phone
	if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM \|\|		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM \|\|
	@@ -571,15 +598,15 @@ public final class CallManager {

	// for events supported only by CDMA phone		// for events supported only by CDMA phone
	if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ){		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ){
	phone.unregisterForCdmaOtaStatusChange(mHandler);		phone.unregisterForCdmaOtaStatusChange(handler);
	phone.unregisterForSubscriptionInfoReady(mHandler);		phone.unregisterForSubscriptionInfoReady(handler);
	phone.unregisterForCallWaiting(mHandler);		phone.unregisterForCallWaiting(handler);
	phone.unregisterForEcmTimerReset(mHandler);		phone.unregisterForEcmTimerReset(handler);
	}		}

	// for events supported only by IMS phone		// for events supported only by IMS phone
	if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
	phone.unregisterForOnHoldTone(mHandler);		phone.unregisterForOnHoldTone(handler);
	}		}
	}		}

	@@ -2116,8 +2143,7 @@ public final class CallManager {
	return false;		return false;
	}		}

	private Handler mHandler = new Handler() {		private class CallManagerHandler extends Handler {

	@Override		@Override
	public void handleMessage(Message msg) {		public void handleMessage(Message msg) {