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

Commit fc40afbd authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Restore old audio behavior for RTT emergency calls" am: e4b693b7 am:... 

Merge "Restore old audio behavior for RTT emergency calls" am: e4b693b7 am: 8b8cf0b8 am: 002ad625
am: da97cff8

Change-Id: Ib595d760a36e600f4ea1548d2fb77b15f7303f21
parents a48b771b da97cff8

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

+0 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
                        getInCallToCsRttPipeForCs(), getCsToInCallRttPipeForCs());

                mWasEverRtt = true;

                if (isEmergencyCall()) {

                    mCallsManager.setAudioRoute(CallAudioState.ROUTE_SPEAKER, null);

                    mCallsManager.mute(false);

                }

            }

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

+0 −5
Original line number Diff line number Diff line
@@ -2300,11 +2300,6 @@ public class CallsManager extends Call.ListenerBase 
      * speaker phone.

      */

    void setAudioRoute(int route, String bluetoothAddress) {

        if (hasEmergencyRttCall() && route != CallAudioState.ROUTE_SPEAKER) {

            Log.i(this, "In an emergency RTT call. Forcing route to speaker.");

            route = CallAudioState.ROUTE_SPEAKER;

            bluetoothAddress = null;

        }

        mCallAudioManager.setAudioRoute(route, bluetoothAddress);

    }