commit fb70e1efbcf173a995e9bb9b312713f8f554e307
author Yorke Lee <yorkelee@google.com> Mon Sep 29 14:22:53 2014 -0700
committer Yorke Lee <yorkelee@google.com> Mon Sep 29 14:22:53 2014 -0700
tree 33ee55dc7c9372c85e89d3ebe485d031e6f6acd7
parent b63254cfa6a9c404fab98f51b2b2f4acf34b59b6

Correctly send the original address in BluetoothPhoneService if using gateway

Bug: 17662993
Change-Id: I3e02f74ace399361033f126bb1e01b8ef5753827

src/com/android/server/telecom/BluetoothPhoneService.java

diff --git a/src/com/android/server/telecom/BluetoothPhoneService.java b/src/com/android/server/telecom/BluetoothPhoneService.java
index 9e02539..7d0dab1 100644
--- a/src/com/android/server/telecom/BluetoothPhoneService.java
+++ b/src/com/android/server/telecom/BluetoothPhoneService.java
@@ -508,7 +508,12 @@
         int index = getIndexForCall(call);
         int direction = call.isIncoming() ? 1 : 0;
         boolean isPartOfConference = call.getParentCall() != null;
-        Uri addressUri = call.getHandle();
+        final Uri addressUri;
+        if (call.getGatewayInfo() != null) {
+            addressUri = call.getGatewayInfo().getOriginalAddress();
+        } else {
+            addressUri = call.getHandle();
+        }
         String address = addressUri == null ? null : addressUri.getSchemeSpecificPart();
         int addressType = address == null ? -1 : PhoneNumberUtils.toaFromString(address);