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 am: 4ab9a5ea60 am: c2d35bfa32

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I757c8b75b292f2d560c320e36c58eae41c24b6b2
This commit is contained in:
Brad Ebinger
2020-12-07 21:30:28 +00:00
committed by Automerger Merge Worker
parent 1ae8c3ec86 c2d35bfa32
commit 057a181dfc
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.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(),