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

Commit 14034756 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 802363d9: Merge "Correctly send the original address in... 

am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev

* commit '802363d9':
  Correctly send the original address in BluetoothPhoneService if using gateway
parents 51ad9bcd 802363d9

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

+6 −1
Original line number Diff line number Diff line
@@ -514,7 +514,12 @@ public final class BluetoothPhoneService extends Service { 
        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);