Final structural tweaks to Telecomm API (4/8) (6fb37c87) · Commits · e / os / android_packages_services_Telecomm

src/com/android/telecomm/Call.java

+42 −53

Original line number	Original line	Diff line number	Diff line
	@@ -22,23 +22,23 @@ import android.graphics.drawable.Drawable;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.telecomm.CallCapabilities;
	import android.telecomm.CallPropertyPresentation;
	import android.telecomm.CallState;
	import android.telecomm.Connection;		import android.telecomm.Connection;
			import android.telecomm.PhoneCapabilities;
			import android.telecomm.PropertyPresentation;
			import android.telecomm.CallState;
	import android.telecomm.ConnectionRequest;		import android.telecomm.ConnectionRequest;
	import android.telecomm.ConnectionService.VideoCallProvider;
	import android.telecomm.GatewayInfo;		import android.telecomm.GatewayInfo;
	import android.telecomm.ParcelableConnection;		import android.telecomm.ParcelableConnection;
	import android.telecomm.PhoneAccount;		import android.telecomm.PhoneAccount;
	import android.telecomm.PhoneAccountHandle;		import android.telecomm.PhoneAccountHandle;
	import android.telecomm.Response;		import android.telecomm.Response;
	import android.telecomm.StatusHints;		import android.telecomm.StatusHints;
			import android.telecomm.VideoProfile;
	import android.telephony.DisconnectCause;		import android.telephony.DisconnectCause;
	import android.telephony.PhoneNumberUtils;		import android.telephony.PhoneNumberUtils;
	import android.text.TextUtils;		import android.text.TextUtils;

	import com.android.internal.telecomm.IVideoCallProvider;		import com.android.internal.telecomm.IVideoProvider;
	import com.android.internal.telephony.CallerInfo;		import com.android.internal.telephony.CallerInfo;
	import com.android.internal.telephony.CallerInfoAsyncQuery;		import com.android.internal.telephony.CallerInfoAsyncQuery;
	import com.android.internal.telephony.CallerInfoAsyncQuery.OnQueryCompleteListener;		import com.android.internal.telephony.CallerInfoAsyncQuery.OnQueryCompleteListener;
	@@ -65,7 +65,7 @@ final class Call implements CreateConnectionResponse {
	* Listener for events on the call.		* Listener for events on the call.
	*/		*/
	interface Listener {		interface Listener {
	void onSuccessfulOutgoingCall(Call call, CallState callState);		void onSuccessfulOutgoingCall(Call call, int callState);
	void onFailedOutgoingCall(Call call, int errorCode, String errorMsg);		void onFailedOutgoingCall(Call call, int errorCode, String errorMsg);
	void onCancelledOutgoingCall(Call call);		void onCancelledOutgoingCall(Call call);
	void onSuccessfulIncomingCall(Call call);		void onSuccessfulIncomingCall(Call call);
	@@ -94,7 +94,7 @@ final class Call implements CreateConnectionResponse {

	abstract static class ListenerBase implements Listener {		abstract static class ListenerBase implements Listener {
	@Override		@Override
	public void onSuccessfulOutgoingCall(Call call, CallState callState) {}		public void onSuccessfulOutgoingCall(Call call, int callState) {}
	@Override		@Override
	public void onFailedOutgoingCall(Call call, int errorCode, String errorMsg) {}		public void onFailedOutgoingCall(Call call, int errorCode, String errorMsg) {}
	@Override		@Override
	@@ -203,18 +203,18 @@ final class Call implements CreateConnectionResponse {
	private long mConnectTimeMillis;		private long mConnectTimeMillis;

	/** The state of the call. */		/** The state of the call. */
	private CallState mState;		private int mState;

	/** The handle with which to establish this call. */		/** The handle with which to establish this call. */
	private Uri mHandle;		private Uri mHandle;

	/** The {@link CallPropertyPresentation} that controls how the handle is shown. */		/** The {@link PropertyPresentation} that controls how the handle is shown. */
	private int mHandlePresentation;		private int mHandlePresentation;

	/** The caller display name (CNAP) set by the connection service. */		/** The caller display name (CNAP) set by the connection service. */
	private String mCallerDisplayName;		private String mCallerDisplayName;

	/** The {@link CallPropertyPresentation} that controls how the caller display name is shown. */		/** The {@link PropertyPresentation} that controls how the caller display name is shown. */
	private int mCallerDisplayNamePresentation;		private int mCallerDisplayNamePresentation;

	/**		/**
	@@ -228,14 +228,14 @@ final class Call implements CreateConnectionResponse {

	/**		/**
	* Tracks the video states which were applicable over the duration of a call.		* Tracks the video states which were applicable over the duration of a call.
	* See {@link android.telecomm.VideoCallProfile} for a list of valid video states.		* See {@link VideoProfile} for a list of valid video states.
	*/		*/
	private int mVideoStateHistory;		private int mVideoStateHistory;

	private int mVideoState;		private int mVideoState;

	/**		/**
	* Disconnect cause for the call. Only valid if the state of the call is DISCONNECTED.		* Disconnect cause for the call. Only valid if the state of the call is STATE_DISCONNECTED.
	* See {@link android.telephony.DisconnectCause}.		* See {@link android.telephony.DisconnectCause}.
	*/		*/
	private int mDisconnectCause = DisconnectCause.NOT_VALID;		private int mDisconnectCause = DisconnectCause.NOT_VALID;
	@@ -279,7 +279,7 @@ final class Call implements CreateConnectionResponse {
	/** Whether an attempt has been made to load the text message responses. */		/** Whether an attempt has been made to load the text message responses. */
	private boolean mCannedSmsResponsesLoadingStarted = false;		private boolean mCannedSmsResponsesLoadingStarted = false;

	private IVideoCallProvider mVideoCallProvider;		private IVideoProvider mVideoProvider;

	private boolean mAudioModeIsVoip;		private boolean mAudioModeIsVoip;
	private StatusHints mStatusHints;		private StatusHints mStatusHints;
	@@ -308,6 +308,7 @@ final class Call implements CreateConnectionResponse {
	mState = isConference ? CallState.ACTIVE : CallState.NEW;		mState = isConference ? CallState.ACTIVE : CallState.NEW;
	mRepository = repository;		mRepository = repository;
	setHandle(handle);		setHandle(handle);
			setHandle(handle, PropertyPresentation.ALLOWED);
	mGatewayInfo = gatewayInfo;		mGatewayInfo = gatewayInfo;
	mConnectionManagerPhoneAccountHandle = connectionManagerPhoneAccountHandle;		mConnectionManagerPhoneAccountHandle = connectionManagerPhoneAccountHandle;
	mTargetPhoneAccountHandle = targetPhoneAccountHandle;		mTargetPhoneAccountHandle = targetPhoneAccountHandle;
	@@ -336,7 +337,7 @@ final class Call implements CreateConnectionResponse {
	Log.piiHandle(mHandle), getVideoState());		Log.piiHandle(mHandle), getVideoState());
	}		}

	CallState getState() {		int getState() {
	if (mIsConference) {		if (mIsConference) {
	if (!mChildCalls.isEmpty()) {		if (!mChildCalls.isEmpty()) {
	// If we have child calls, just return the child call.		// If we have child calls, just return the child call.
	@@ -354,7 +355,7 @@ final class Call implements CreateConnectionResponse {
	* misbehave and they do this very often. The result is that we do not enforce state transitions		* misbehave and they do this very often. The result is that we do not enforce state transitions
	* and instead keep the code resilient to unexpected state changes.		* and instead keep the code resilient to unexpected state changes.
	*/		*/
	void setState(CallState newState) {		void setState(int newState) {
	Preconditions.checkState(newState != CallState.DISCONNECTED \|\|		Preconditions.checkState(newState != CallState.DISCONNECTED \|\|
	mDisconnectCause != DisconnectCause.NOT_VALID);		mDisconnectCause != DisconnectCause.NOT_VALID);
	if (mState != newState) {		if (mState != newState) {
	@@ -385,7 +386,7 @@ final class Call implements CreateConnectionResponse {


	void setHandle(Uri handle) {		void setHandle(Uri handle) {
	setHandle(handle, CallPropertyPresentation.ALLOWED);		setHandle(handle, PropertyPresentation.ALLOWED);
	}		}

	void setHandle(Uri handle, int presentation) {		void setHandle(Uri handle, int presentation) {
	@@ -536,7 +537,7 @@ final class Call implements CreateConnectionResponse {
	}		}

	void setCallCapabilities(int callCapabilities) {		void setCallCapabilities(int callCapabilities) {
	Log.v(this, "setCallCapabilities: %s", CallCapabilities.toString(callCapabilities));		Log.v(this, "setCallCapabilities: %s", PhoneCapabilities.toString(callCapabilities));
	if (mCallCapabilities != callCapabilities) {		if (mCallCapabilities != callCapabilities) {
	mCallCapabilities = callCapabilities;		mCallCapabilities = callCapabilities;
	for (Listener l : mListeners) {		for (Listener l : mListeners) {
	@@ -591,14 +592,14 @@ final class Call implements CreateConnectionResponse {
	if (mCallerInfo != null && mCallerInfo.shouldSendToVoicemail) {		if (mCallerInfo != null && mCallerInfo.shouldSendToVoicemail) {
	Log.i(this, "Directing call to voicemail: %s.", this);		Log.i(this, "Directing call to voicemail: %s.", this);
	// TODO: Once we move State handling from CallsManager to Call, we		// TODO: Once we move State handling from CallsManager to Call, we
	// will not need to set RINGING state prior to calling reject.		// will not need to set STATE_RINGING state prior to calling reject.
	setState(CallState.RINGING);		setState(CallState.RINGING);
	reject(false, null);		reject(false, null);
	} else {		} else {
	// TODO: Make this class (not CallsManager) responsible for changing		// TODO: Make this class (not CallsManager) responsible for changing
	// the call state to RINGING.		// the call state to STATE_RINGING.

	// TODO: Replace this with state transition to RINGING.		// TODO: Replace this with state transition to STATE_RINGING.
	for (Listener l : mListeners) {		for (Listener l : mListeners) {
	l.onSuccessfulIncomingCall(this);		l.onSuccessfulIncomingCall(this);
	}		}
	@@ -628,7 +629,7 @@ final class Call implements CreateConnectionResponse {
	setCallerDisplayName(		setCallerDisplayName(
	connection.getCallerDisplayName(), connection.getCallerDisplayNamePresentation());		connection.getCallerDisplayName(), connection.getCallerDisplayNamePresentation());

	setVideoCallProvider(connection.getVideoCallProvider());		setVideoProvider(connection.getVideoProvider());
	setVideoState(connection.getVideoState());		setVideoState(connection.getVideoState());

	if (mIsIncoming) {		if (mIsIncoming) {
	@@ -753,7 +754,7 @@ final class Call implements CreateConnectionResponse {
	if (isRinging("answer")) {		if (isRinging("answer")) {
	// At this point, we are asking the connection service to answer but we don't assume		// At this point, we are asking the connection service to answer but we don't assume
	// that it will work. Instead, we wait until confirmation from the connectino service		// that it will work. Instead, we wait until confirmation from the connectino service
	// that the call is in a non-RINGING state before changing the UI. See		// that the call is in a non-STATE_RINGING state before changing the UI. See
	// {@link ConnectionServiceAdapter#setActive} and other set* methods.		// {@link ConnectionServiceAdapter#setActive} and other set* methods.
	mConnectionService.answer(this, videoState);		mConnectionService.answer(this, videoState);
	}		}
	@@ -800,10 +801,10 @@ final class Call implements CreateConnectionResponse {
	/** Checks if this is a live call or not. */		/** Checks if this is a live call or not. */
	boolean isAlive() {		boolean isAlive() {
	switch (mState) {		switch (mState) {
	case NEW:		case CallState.NEW:
	case RINGING:		case CallState.RINGING:
	case DISCONNECTED:		case CallState.DISCONNECTED:
	case ABORTED:		case CallState.ABORTED:
	return false;		return false;
	default:		default:
	return true;		return true;
	@@ -868,10 +869,6 @@ final class Call implements CreateConnectionResponse {
	// TODO: todo		// TODO: todo
	}		}

	void swapWithBackgroundCall() {
	mConnectionService.swapWithBackgroundCall(this);
	}

	void setParentCall(Call parentCall) {		void setParentCall(Call parentCall) {
	if (parentCall == this) {		if (parentCall == this) {
	Log.e(this, new Exception(), "setting the parent to self");		Log.e(this, new Exception(), "setting the parent to self");
	@@ -1122,28 +1119,23 @@ final class Call implements CreateConnectionResponse {
	/**		/**
	* Sets a video call provider for the call.		* Sets a video call provider for the call.
	*/		*/
	public void setVideoCallProvider(IVideoCallProvider videoCallProvider) {		public void setVideoProvider(IVideoProvider videoProvider) {
	mVideoCallProvider = videoCallProvider;		mVideoProvider = videoProvider;
	for (Listener l : mListeners) {		for (Listener l : mListeners) {
	l.onVideoCallProviderChanged(Call.this);		l.onVideoCallProviderChanged(Call.this);
	}		}
	}		}

	/**		/**
	* @return Return the {@link VideoCallProvider} binder.		* @return Return the {@link Connection.VideoProvider} binder.
	*/		*/
	public IVideoCallProvider getVideoCallProvider() {		public IVideoProvider getVideoProvider() {
	return mVideoCallProvider;		return mVideoProvider;
	}		}

	/**		/**
	* The current video state for the call.		* The current video state for the call.
	* Valid values: {@link android.telecomm.VideoCallProfile#VIDEO_STATE_AUDIO_ONLY},		* Valid values: see {@link VideoProfile.VideoState}.
	* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_BIDIRECTIONAL},
	* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_TX_ENABLED},
	* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_RX_ENABLED}.
	*
	* @return True if video is enabled.
	*/		*/
	public int getVideoState() {		public int getVideoState() {
	return mVideoState;		return mVideoState;
	@@ -1151,7 +1143,7 @@ final class Call implements CreateConnectionResponse {

	/**		/**
	* Returns the video states which were applicable over the duration of a call.		* Returns the video states which were applicable over the duration of a call.
	* See {@link android.telecomm.VideoCallProfile} for a list of valid video states.		* See {@link VideoProfile} for a list of valid video states.
	*		*
	* @return The video states applicable over the duration of the call.		* @return The video states applicable over the duration of the call.
	*/		*/
	@@ -1162,10 +1154,7 @@ final class Call implements CreateConnectionResponse {
	/**		/**
	* Determines the current video state for the call.		* Determines the current video state for the call.
	* For an outgoing call determines the desired video state for the call.		* For an outgoing call determines the desired video state for the call.
	* Valid values: {@link android.telecomm.VideoCallProfile#VIDEO_STATE_AUDIO_ONLY},		* Valid values: see {@link VideoProfile.VideoState}
	* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_BIDIRECTIONAL},
	* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_TX_ENABLED},
	* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_RX_ENABLED}.
	*		*
	* @param videoState The video state for the call.		* @param videoState The video state for the call.
	*/		*/
	@@ -1211,19 +1200,19 @@ final class Call implements CreateConnectionResponse {
	}		}
	}		}

	private CallState getStateFromConnectionState(int state) {		private int getStateFromConnectionState(int state) {
	switch (state) {		switch (state) {
	case Connection.State.ACTIVE:		case Connection.STATE_ACTIVE:
	return CallState.ACTIVE;		return CallState.ACTIVE;
	case Connection.State.DIALING:		case Connection.STATE_DIALING:
	return CallState.DIALING;		return CallState.DIALING;
	case Connection.State.DISCONNECTED:		case Connection.STATE_DISCONNECTED:
	return CallState.DISCONNECTED;		return CallState.DISCONNECTED;
	case Connection.State.HOLDING:		case Connection.STATE_HOLDING:
	return CallState.ON_HOLD;		return CallState.ON_HOLD;
	case Connection.State.NEW:		case Connection.STATE_NEW:
	return CallState.NEW;		return CallState.NEW;
	case Connection.State.RINGING:		case Connection.STATE_RINGING:
	return CallState.RINGING;		return CallState.RINGING;
	}		}
	return CallState.DISCONNECTED;		return CallState.DISCONNECTED;

src/com/android/telecomm/CallAudioManager.java

+38 −38

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@ package com.android.telecomm;

	import android.content.Context;		import android.content.Context;
	import android.media.AudioManager;		import android.media.AudioManager;
	import android.telecomm.CallAudioState;		import android.telecomm.AudioState;
	import android.telecomm.CallState;		import android.telecomm.CallState;

	import com.google.common.base.Preconditions;		import com.google.common.base.Preconditions;
	@@ -37,7 +37,7 @@ final class CallAudioManager extends CallsManagerListenerBase
	private final BluetoothManager mBluetoothManager;		private final BluetoothManager mBluetoothManager;
	private final WiredHeadsetManager mWiredHeadsetManager;		private final WiredHeadsetManager mWiredHeadsetManager;

	private CallAudioState mAudioState;		private AudioState mAudioState;
	private int mAudioFocusStreamType;		private int mAudioFocusStreamType;
	private boolean mIsRinging;		private boolean mIsRinging;
	private boolean mIsTonePlaying;		private boolean mIsTonePlaying;
	@@ -56,7 +56,7 @@ final class CallAudioManager extends CallsManagerListenerBase
	mAudioFocusStreamType = STREAM_NONE;		mAudioFocusStreamType = STREAM_NONE;
	}		}

	CallAudioState getAudioState() {		AudioState getAudioState() {
	return mAudioState;		return mAudioState;
	}		}

	@@ -86,7 +86,7 @@ final class CallAudioManager extends CallsManagerListenerBase
	}		}

	@Override		@Override
	public void onCallStateChanged(Call call, CallState oldState, CallState newState) {		public void onCallStateChanged(Call call, int oldState, int newState) {
	onCallUpdated(call);		onCallUpdated(call);
	}		}

	@@ -100,7 +100,7 @@ final class CallAudioManager extends CallsManagerListenerBase
	boolean isOnlyCall = CallsManager.getInstance().getCalls().size() == 1;		boolean isOnlyCall = CallsManager.getInstance().getCalls().size() == 1;
	if (isOnlyCall && mBluetoothManager.isBluetoothAvailable()) {		if (isOnlyCall && mBluetoothManager.isBluetoothAvailable()) {
	mBluetoothManager.connectBluetoothAudio();		mBluetoothManager.connectBluetoothAudio();
	route = CallAudioState.ROUTE_BLUETOOTH;		route = AudioState.ROUTE_BLUETOOTH;
	}		}

	setSystemAudioState(false /* isMute */, route, mAudioState.supportedRouteMask);		setSystemAudioState(false /* isMute */, route, mAudioState.supportedRouteMask);
	@@ -129,14 +129,14 @@ final class CallAudioManager extends CallsManagerListenerBase
	return;		return;
	}		}

	int newRoute = CallAudioState.ROUTE_EARPIECE;		int newRoute = AudioState.ROUTE_EARPIECE;
	if (newIsPluggedIn) {		if (newIsPluggedIn) {
	newRoute = CallAudioState.ROUTE_WIRED_HEADSET;		newRoute = AudioState.ROUTE_WIRED_HEADSET;
	} else if (mWasSpeakerOn) {		} else if (mWasSpeakerOn) {
	Call call = getForegroundCall();		Call call = getForegroundCall();
	if (call != null && call.isAlive()) {		if (call != null && call.isAlive()) {
	// Restore the speaker state.		// Restore the speaker state.
	newRoute = CallAudioState.ROUTE_SPEAKER;		newRoute = AudioState.ROUTE_SPEAKER;
	}		}
	}		}
	setSystemAudioState(mAudioState.isMuted, newRoute, calculateSupportedRoutes());		setSystemAudioState(mAudioState.isMuted, newRoute, calculateSupportedRoutes());
	@@ -167,7 +167,7 @@ final class CallAudioManager extends CallsManagerListenerBase
	/**		/**
	* Changed the audio route, for example from earpiece to speaker phone.		* Changed the audio route, for example from earpiece to speaker phone.
	*		*
	* @param route The new audio route to use. See {@link CallAudioState}.		* @param route The new audio route to use. See {@link AudioState}.
	*/		*/
	void setAudioRoute(int route) {		void setAudioRoute(int route) {
	// This can happen even when there are no calls and we don't have focus.		// This can happen even when there are no calls and we don't have focus.
	@@ -175,7 +175,7 @@ final class CallAudioManager extends CallsManagerListenerBase
	return;		return;
	}		}

	Log.v(this, "setAudioRoute, route: %s", CallAudioState.audioRouteToString(route));		Log.v(this, "setAudioRoute, route: %s", AudioState.audioRouteToString(route));

	// Change ROUTE_WIRED_OR_EARPIECE to a single entry.		// Change ROUTE_WIRED_OR_EARPIECE to a single entry.
	int newRoute = selectWiredOrEarpiece(route, mAudioState.supportedRouteMask);		int newRoute = selectWiredOrEarpiece(route, mAudioState.supportedRouteMask);
	@@ -189,7 +189,7 @@ final class CallAudioManager extends CallsManagerListenerBase
	if (mAudioState.route != newRoute) {		if (mAudioState.route != newRoute) {
	// Remember the new speaker state so it can be restored when the user plugs and unplugs		// Remember the new speaker state so it can be restored when the user plugs and unplugs
	// a headset.		// a headset.
	mWasSpeakerOn = newRoute == CallAudioState.ROUTE_SPEAKER;		mWasSpeakerOn = newRoute == AudioState.ROUTE_SPEAKER;
	setSystemAudioState(mAudioState.isMuted, newRoute, mAudioState.supportedRouteMask);		setSystemAudioState(mAudioState.isMuted, newRoute, mAudioState.supportedRouteMask);
	}		}
	}		}
	@@ -230,9 +230,9 @@ final class CallAudioManager extends CallsManagerListenerBase

	int newRoute = mAudioState.route;		int newRoute = mAudioState.route;
	if (bluetoothManager.isBluetoothAudioConnectedOrPending()) {		if (bluetoothManager.isBluetoothAudioConnectedOrPending()) {
	newRoute = CallAudioState.ROUTE_BLUETOOTH;		newRoute = AudioState.ROUTE_BLUETOOTH;
	} else if (mAudioState.route == CallAudioState.ROUTE_BLUETOOTH) {		} else if (mAudioState.route == AudioState.ROUTE_BLUETOOTH) {
	newRoute = CallAudioState.ROUTE_WIRED_OR_EARPIECE;		newRoute = AudioState.ROUTE_WIRED_OR_EARPIECE;
	// Do not switch to speaker when bluetooth disconnects.		// Do not switch to speaker when bluetooth disconnects.
	mWasSpeakerOn = false;		mWasSpeakerOn = false;
	}		}
	@@ -248,10 +248,10 @@ final class CallAudioManager extends CallsManagerListenerBase
	return mBluetoothManager.isBluetoothAvailable();		return mBluetoothManager.isBluetoothAvailable();
	}		}

	private void saveAudioState(CallAudioState audioState) {		private void saveAudioState(AudioState audioState) {
	mAudioState = audioState;		mAudioState = audioState;
	mStatusBarNotifier.notifyMute(mAudioState.isMuted);		mStatusBarNotifier.notifyMute(mAudioState.isMuted);
	mStatusBarNotifier.notifySpeakerphone(mAudioState.route == CallAudioState.ROUTE_SPEAKER);		mStatusBarNotifier.notifySpeakerphone(mAudioState.route == AudioState.ROUTE_SPEAKER);
	}		}

	private void onCallUpdated(Call call) {		private void onCallUpdated(Call call) {
	@@ -269,8 +269,8 @@ final class CallAudioManager extends CallsManagerListenerBase
	return;		return;
	}		}

	CallAudioState oldAudioState = mAudioState;		AudioState oldAudioState = mAudioState;
	saveAudioState(new CallAudioState(isMuted, route, supportedRouteMask));		saveAudioState(new AudioState(isMuted, route, supportedRouteMask));
	if (Objects.equals(oldAudioState, mAudioState)) {		if (Objects.equals(oldAudioState, mAudioState)) {
	return;		return;
	}		}
	@@ -283,14 +283,14 @@ final class CallAudioManager extends CallsManagerListenerBase
	}		}

	// Audio route.		// Audio route.
	if (mAudioState.route == CallAudioState.ROUTE_BLUETOOTH) {		if (mAudioState.route == AudioState.ROUTE_BLUETOOTH) {
	turnOnSpeaker(false);		turnOnSpeaker(false);
	turnOnBluetooth(true);		turnOnBluetooth(true);
	} else if (mAudioState.route == CallAudioState.ROUTE_SPEAKER) {		} else if (mAudioState.route == AudioState.ROUTE_SPEAKER) {
	turnOnBluetooth(false);		turnOnBluetooth(false);
	turnOnSpeaker(true);		turnOnSpeaker(true);
	} else if (mAudioState.route == CallAudioState.ROUTE_EARPIECE \|\|		} else if (mAudioState.route == AudioState.ROUTE_EARPIECE \|\|
	mAudioState.route == CallAudioState.ROUTE_WIRED_HEADSET) {		mAudioState.route == AudioState.ROUTE_WIRED_HEADSET) {
	turnOnBluetooth(false);		turnOnBluetooth(false);
	turnOnSpeaker(false);		turnOnSpeaker(false);
	}		}
	@@ -390,37 +390,37 @@ final class CallAudioManager extends CallsManagerListenerBase
	// Since they are mutually exclusive and one is ALWAYS valid, we allow a special input of		// Since they are mutually exclusive and one is ALWAYS valid, we allow a special input of
	// ROUTE_WIRED_OR_EARPIECE so that callers dont have to make a call to check which is		// ROUTE_WIRED_OR_EARPIECE so that callers dont have to make a call to check which is
	// supported before calling setAudioRoute.		// supported before calling setAudioRoute.
	if (route == CallAudioState.ROUTE_WIRED_OR_EARPIECE) {		if (route == AudioState.ROUTE_WIRED_OR_EARPIECE) {
	route = CallAudioState.ROUTE_WIRED_OR_EARPIECE & supportedRouteMask;		route = AudioState.ROUTE_WIRED_OR_EARPIECE & supportedRouteMask;
	if (route == 0) {		if (route == 0) {
	Log.wtf(this, "One of wired headset or earpiece should always be valid.");		Log.wtf(this, "One of wired headset or earpiece should always be valid.");
	// assume earpiece in this case.		// assume earpiece in this case.
	route = CallAudioState.ROUTE_EARPIECE;		route = AudioState.ROUTE_EARPIECE;
	}		}
	}		}
	return route;		return route;
	}		}

	private int calculateSupportedRoutes() {		private int calculateSupportedRoutes() {
	int routeMask = CallAudioState.ROUTE_SPEAKER;		int routeMask = AudioState.ROUTE_SPEAKER;

	if (mWiredHeadsetManager.isPluggedIn()) {		if (mWiredHeadsetManager.isPluggedIn()) {
	routeMask \|= CallAudioState.ROUTE_WIRED_HEADSET;		routeMask \|= AudioState.ROUTE_WIRED_HEADSET;
	} else {		} else {
	routeMask \|= CallAudioState.ROUTE_EARPIECE;		routeMask \|= AudioState.ROUTE_EARPIECE;
	}		}

	if (mBluetoothManager.isBluetoothAvailable()) {		if (mBluetoothManager.isBluetoothAvailable()) {
	routeMask \|= CallAudioState.ROUTE_BLUETOOTH;		routeMask \|= AudioState.ROUTE_BLUETOOTH;
	}		}

	return routeMask;		return routeMask;
	}		}

	private CallAudioState getInitialAudioState(Call call) {		private AudioState getInitialAudioState(Call call) {
	int supportedRouteMask = calculateSupportedRoutes();		int supportedRouteMask = calculateSupportedRoutes();
	int route = selectWiredOrEarpiece(		int route = selectWiredOrEarpiece(
	CallAudioState.ROUTE_WIRED_OR_EARPIECE, supportedRouteMask);		AudioState.ROUTE_WIRED_OR_EARPIECE, supportedRouteMask);

	// We want the UI to indicate that "bluetooth is in use" in two slightly different cases:		// We want the UI to indicate that "bluetooth is in use" in two slightly different cases:
	// (a) The obvious case: if a bluetooth headset is currently in use for an ongoing call.		// (a) The obvious case: if a bluetooth headset is currently in use for an ongoing call.
	@@ -430,22 +430,22 @@ final class CallAudioManager extends CallsManagerListenerBase
	// the first call.		// the first call.
	if (call != null && mBluetoothManager.isBluetoothAvailable()) {		if (call != null && mBluetoothManager.isBluetoothAvailable()) {
	switch(call.getState()) {		switch(call.getState()) {
	case ACTIVE:		case CallState.ACTIVE:
	case ON_HOLD:		case CallState.ON_HOLD:
	case DIALING:		case CallState.DIALING:
	case RINGING:		case CallState.RINGING:
	route = CallAudioState.ROUTE_BLUETOOTH;		route = AudioState.ROUTE_BLUETOOTH;
	break;		break;
	default:		default:
	break;		break;
	}		}
	}		}

	return new CallAudioState(false, route, supportedRouteMask);		return new AudioState(false, route, supportedRouteMask);
	}		}

	private void setInitialAudioState(Call call) {		private void setInitialAudioState(Call call) {
	CallAudioState audioState = getInitialAudioState(call);		AudioState audioState = getInitialAudioState(call);
	Log.v(this, "setInitialAudioState %s, %s", audioState, call);		Log.v(this, "setInitialAudioState %s, %s", audioState, call);
	setSystemAudioState(audioState.isMuted, audioState.route, audioState.supportedRouteMask);		setSystemAudioState(audioState.isMuted, audioState.route, audioState.supportedRouteMask);
	}		}

src/com/android/telecomm/CallLogManager.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@ import android.os.AsyncTask;
	import android.provider.CallLog.Calls;		import android.provider.CallLog.Calls;
	import android.telecomm.CallState;		import android.telecomm.CallState;
	import android.telecomm.PhoneAccountHandle;		import android.telecomm.PhoneAccountHandle;
	import android.telecomm.VideoCallProfile;		import android.telecomm.VideoProfile;
	import android.telephony.PhoneNumberUtils;		import android.telephony.PhoneNumberUtils;

	import com.android.internal.telephony.CallerInfo;		import com.android.internal.telephony.CallerInfo;
	@@ -87,7 +87,7 @@ final class CallLogManager extends CallsManagerListenerBase {
	}		}

	@Override		@Override
	public void onCallStateChanged(Call call, CallState oldState, CallState newState) {		public void onCallStateChanged(Call call, int oldState, int newState) {
	if ((newState == CallState.DISCONNECTED \|\| newState == CallState.ABORTED) &&		if ((newState == CallState.DISCONNECTED \|\| newState == CallState.ABORTED) &&
	oldState != CallState.PRE_DIAL_WAIT) {		oldState != CallState.PRE_DIAL_WAIT) {
	int type;		int type;
	@@ -180,8 +180,8 @@ final class CallLogManager extends CallsManagerListenerBase {
	* @return The call features.		* @return The call features.
	*/		*/
	private static int getCallFeatures(int videoState) {		private static int getCallFeatures(int videoState) {
	if ((videoState & VideoCallProfile.VideoState.TX_ENABLED)		if ((videoState & VideoProfile.VideoState.TX_ENABLED)
	== VideoCallProfile.VideoState.TX_ENABLED) {		== VideoProfile.VideoState.TX_ENABLED) {
	return Calls.FEATURES_VIDEO;		return Calls.FEATURES_VIDEO;
	}		}
	return Calls.FEATURES_NONE;		return Calls.FEATURES_NONE;

src/com/android/telecomm/CallsManager.java

+15 −15

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/telecomm/CallsManagerListenerBase.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package com.android.telecomm;		package com.android.telecomm;

	import android.telecomm.CallAudioState;		import android.telecomm.AudioState;
	import android.telecomm.CallState;		import android.telecomm.CallState;

	/**		/**
	@@ -32,7 +32,7 @@ class CallsManagerListenerBase implements CallsManager.CallsManagerListener {
	}		}

	@Override		@Override
	public void onCallStateChanged(Call call, CallState oldState, CallState newState) {		public void onCallStateChanged(Call call, int oldState, int newState) {
	}		}

	@Override		@Override
	@@ -55,7 +55,7 @@ class CallsManagerListenerBase implements CallsManager.CallsManagerListener {
	}		}

	@Override		@Override
	public void onAudioStateChanged(CallAudioState oldAudioState, CallAudioState newAudioState) {		public void onAudioStateChanged(AudioState oldAudioState, AudioState newAudioState) {
	}		}

	@Override		@Override