Merge "Fix to set audio mode" (acaf9400) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/CallAudioManager.java

+12 −7

Original line number	Diff line number	Diff line
		@@ -279,13 +279,18 @@ final class CallAudioManager extends CallsManagerListenerBase

		private void onCallUpdated(Call call) {
		boolean wasNotVoiceCall = mAudioFocusStreamType != AudioManager.STREAM_VOICE_CALL;
		if (call != null) {
		if (call.getState() != CallState.DISCONNECTED) {
		updateAudioStreamAndMode();
		if ((call != null) && (call.getState() == CallState.ACTIVE) &&
		}
		if ((call.getState() == CallState.ACTIVE) &&
		(call.getTargetPhoneAccount() != null) &&
		call.getTargetPhoneAccount().getId().equals(mSubId) && mSpeedUpAudioForMtCall) {
		Log.d(this,"Reset mSpeedUpAudioForMtCall");
		mSpeedUpAudioForMtCall = false;
		}
		}

		// If we transition from not voice call to voice call, we need to set an initial state.
		if (wasNotVoiceCall && mAudioFocusStreamType == AudioManager.STREAM_VOICE_CALL) {
		setInitialAudioState(call, true /* force */);
		@@ -364,7 +369,7 @@ final class CallAudioManager extends CallsManagerListenerBase
		requestAudioFocusAndSetMode(AudioManager.STREAM_RING, AudioManager.MODE_RINGTONE);
		} else {
		Call call = getForegroundCall();
		if (call != null && call.getState() != CallState.DISCONNECTED) {
		if (call != null) {
		int mode = call.getIsVoipAudioMode() ?
		AudioManager.MODE_IN_COMMUNICATION : AudioManager.MODE_IN_CALL;
		requestAudioFocusAndSetMode(AudioManager.STREAM_VOICE_CALL, mode);