Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b8facb5 authored by Srikanth Chintala's avatar Srikanth Chintala Committed by Tyler Gunn
Browse files

Fix to set audio mode for SIP call 

Set the audio mode for sip call as
MODE_IN_COMMUNICATION if the phone
account has extra
EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE with
true value.

Test: Manual
Bug: 34869196
Change-Id: I367fbfb05779f80ebde78cb8dcebeafa3f885b3b
parent ed317f45

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

+0 −1
Original line number Diff line number Diff line
@@ -1472,7 +1472,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
@@ -864,6 +864,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 &&
@@ -1151,11 +1158,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
@@ -1643,11 +1659,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);