Merge "Fix to set audio mode for SIP call" into oc-dr1-dev (adba4634) · Commits · e / os / android_packages_services_Telecomm

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -1469,7 +1469,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		setVideoProvider(connection.getVideoProvider());
		setVideoState(connection.getVideoState());
		setRingbackRequested(connection.isRingbackRequested());
		setIsVoipAudioMode(connection.getIsVoipAudioMode());
		setStatusHints(connection.getStatusHints());
		putExtras(SOURCE_CONNECTION_SERVICE, connection.getExtras());

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

+26 −5

Original line number	Diff line number	Diff line
		@@ -865,6 +865,13 @@ public class CallsManager extends Call.ListenerBase
		call.putExtras(Call.SOURCE_CONNECTION_SERVICE, dropCallExtras);
		}
		}

		if (phoneAccount.getExtras()
		.getBoolean(PhoneAccount.EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE)) {
		Log.d(this, "processIncomingCallIntent: defaulting to voip mode for call %s",
		call.getId());
		call.setIsVoipAudioMode(true);
		}
		}
		if (extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
		if (phoneAccount != null &&
		@@ -1153,11 +1160,20 @@ public class CallsManager extends Call.ListenerBase
		extras = new Bundle(extras);
		extras.putParcelableList(android.telecom.Call.AVAILABLE_PHONE_ACCOUNTS, accounts);
		} else {
		PhoneAccount accountToUse =
		mPhoneAccountRegistrar.getPhoneAccount(phoneAccountHandle, initiatingUser);
		if (accountToUse != null && accountToUse.getExtras() != null) {
		if (accountToUse.getExtras()
		.getBoolean(PhoneAccount.EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE)) {
		Log.d(this, "startOutgoingCall: defaulting to voip mode for call %s",
		call.getId());
		call.setIsVoipAudioMode(true);
		}
		}

		call.setState(
		CallState.CONNECTING,
		phoneAccountHandle == null ? "no-handle" : phoneAccountHandle.toString());
		PhoneAccount accountToUse =
		mPhoneAccountRegistrar.getPhoneAccount(phoneAccountHandle, initiatingUser);
		if (extras != null
		&& extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
		if (accountToUse != null
		@@ -1645,11 +1661,16 @@ public class CallsManager extends Call.ListenerBase
		Log.i(this, "Attempted to add account to unknown call %s", call);
		} else {
		call.setTargetPhoneAccount(account);

		if (call.getIntentExtras()
		.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
		PhoneAccount realPhoneAccount =
		mPhoneAccountRegistrar.getPhoneAccountUnchecked(account);
		if (realPhoneAccount != null && realPhoneAccount.getExtras() != null
		&& realPhoneAccount.getExtras()
		.getBoolean(PhoneAccount.EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE)) {
		Log.d("phoneAccountSelected: default to voip mode for call %s", call.getId());
		call.setIsVoipAudioMode(true);
		}
		if (call.getIntentExtras()
		.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
		if (realPhoneAccount != null
		&& realPhoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_RTT)) {
		call.setRttStreams(true);