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

Commit 76f7411e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add warning message when sending clcc response but mBluetoothHeadset is null" am: 1dbad522 

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

Change-Id: I6d9c4ff97454b33690bb8659b4f42938097e0e22
parents 17c4d100 1dbad522

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

+9 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.text.TextUtils; 
import android.util.Log;



import com.android.bluetooth.hfp.BluetoothHeadsetProxy;

import com.android.bluetooth.hfp.HeadsetService;



import androidx.annotation.VisibleForTesting;
@@ -657,7 +658,14 @@ public class BluetoothInCallService extends InCallService { 
                            + addressType);

        }



        if (mBluetoothHeadset != null) {

        if (mBluetoothHeadset == null) {

            Log.w(TAG, "mBluetoothHeasdset is null when sending clcc for BluetoothCall "

                    + index + ", "

                    + direction + ", "

                    + state + ", "

                    + isPartOfConference + ", "

                    + addressType);

        } else {

            mBluetoothHeadset.clccResponse(

                    index, direction, state, 0, isPartOfConference, address, addressType);

        }