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

Commit c2d35bfa authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Use phoneAccountHandle based on connection" am: eb87a526 am: 4ab9a5ea 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428408

Change-Id: Ibe583151729e8d9683b3df2159689e9e7249b7cc
parents c67fa6b7 4ab9a5ea

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(),