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

Commit 711bc786 authored by Grzegorz Kolodziejczyk's avatar Grzegorz Kolodziejczyk Committed by Automerger Merge Worker
Browse files

Merge "tbs: Use contact name instead of caller name as friendly name" am:... 

Merge "tbs: Use contact name instead of caller name as friendly name" am: 72b0bc27 am: 176eeb9e am: 629c85d7 am: cd14b0f0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2544932



Change-Id: I9edb04ab3b4696d6a2c21f5e232f130f323181e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea325d78 cd14b0f0

android/app/src/com/android/bluetooth/telephony/BluetoothInCallService.java

+6 −2
Original line number Diff line number Diff line
@@ -1472,8 +1472,12 @@ public class BluetoothInCallService extends InCallService { 
        String uri = addressUri == null ? null : addressUri.toString();

        int callFlags = call.isIncoming() ? 0 : BluetoothLeCall.FLAG_OUTGOING_CALL;



        return new BluetoothLeCall(call.getTbsCallId(), uri, call.getCallerDisplayName(), state,

                       callFlags);

        String friendlyName = call.getCallerDisplayName();

        if (TextUtils.isEmpty(friendlyName)) {

            friendlyName = call.getContactDisplayName();

        }



        return new BluetoothLeCall(call.getTbsCallId(), uri, friendlyName, state, callFlags);

    }



    private void sendTbsCurrentCallsList() {