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

Commit eb87a526 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Use phoneAccountHandle based on connection"

parents 87b5c6a2 7f413745

telecomm/java/android/telecom/ConnectionService.java

+4 −2
Original line number Diff line number Diff line
@@ -1988,8 +1988,10 @@ public abstract class ConnectionService extends Service { 
            connection.setAudioModeIsVoip(true);

        }

        connection.setTelecomCallId(callId);

        PhoneAccountHandle phoneAccountHandle = connection.getPhoneAccountHandle() == null

                            ? request.getAccountHandle() : connection.getPhoneAccountHandle();

        if (connection.getState() != Connection.STATE_DISCONNECTED) {

            addConnection(request.getAccountHandle(), callId, connection);

            addConnection(phoneAccountHandle, callId, connection);

        }



        Uri address = connection.getAddress();
@@ -2005,7 +2007,7 @@ public abstract class ConnectionService extends Service { 
                callId,

                request,

                new ParcelableConnection(

                        request.getAccountHandle(),

                        phoneAccountHandle,

                        connection.getState(),

                        connection.getConnectionCapabilities(),

                        connection.getConnectionProperties(),