Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use phoneAccountHandle based on connection" am: eb87a5267f

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

Change-Id: Ia95430a2965e8647faa3ce19d04ae55be7e2769e
This commit is contained in:
Brad Ebinger
2020-12-07 20:09:42 +00:00
committed by Automerger Merge Worker
parent 659f09f56f eb87a5267f
commit 4ab9a5ea60
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -1988,8 +1988,10 @@ public abstract class ConnectionService extends Service {
connection.setAudioModeIsVoip(true); connection.setAudioModeIsVoip(true);
} }
connection.setTelecomCallId(callId); connection.setTelecomCallId(callId);
PhoneAccountHandle phoneAccountHandle = connection.getPhoneAccountHandle() == null
? request.getAccountHandle() : connection.getPhoneAccountHandle();
if (connection.getState() != Connection.STATE_DISCONNECTED) { if (connection.getState() != Connection.STATE_DISCONNECTED) {
addConnection(request.getAccountHandle(), callId, connection); addConnection(phoneAccountHandle, callId, connection);
} }
Uri address = connection.getAddress(); Uri address = connection.getAddress();
@@ -2005,7 +2007,7 @@ public abstract class ConnectionService extends Service {
callId, callId,
request, request,
new ParcelableConnection( new ParcelableConnection(
request.getAccountHandle(), phoneAccountHandle,
connection.getState(), connection.getState(),
connection.getConnectionCapabilities(), connection.getConnectionCapabilities(),
connection.getConnectionProperties(), connection.getConnectionProperties(),