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

Commit b30a9398 authored by Matthew Xie's avatar Matthew Xie
Browse files

resolved conflicts for merge of e28bb783 to master 

Change-Id: I7bb1b91da3ae3b6e7e21b34a0cdfb5ed417135bc
parents 227292eb e28bb783

android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+1 −0
Original line number Diff line number Diff line
@@ -2787,6 +2787,7 @@ final class HeadsetStateMachine extends StateMachine { 
                    }

                    clccResponseNative(1, 0, 0, 0, false, phoneNumber, type,

                                                       getByteAddress(device));

                    clccResponseNative(0, 0, 0, 0, false, "", 0, getByteAddress(device));

                }

                else if (!mPhoneProxy.listCurrentCalls()) {

                    clccResponseNative(0, 0, 0, 0, false, "", 0,