diff options
| author | Brad Ebinger <breadley@google.com> | 2020-12-07 20:09:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-07 20:09:42 +0000 |
| commit | 4ab9a5ea6030573b9041d11bc6d6150b9e4c617c (patch) | |
| tree | e3760424505e024b4c2ede3d14e6f48deff2e816 /telecomm/java/android/telecom/ConnectionService.java | |
| parent | 659f09f56f5819c22330604bc1310e830590bd17 (diff) | |
| parent | eb87a5267f4bc23646e37200695a444f9d13dc5f (diff) | |
Merge "Use phoneAccountHandle based on connection" am: eb87a5267f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428408
Change-Id: Ia95430a2965e8647faa3ce19d04ae55be7e2769e
Diffstat (limited to 'telecomm/java/android/telecom/ConnectionService.java')
| -rwxr-xr-x | telecomm/java/android/telecom/ConnectionService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 6288bc1698e9..b1ccb533e83d 100755 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -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(), |