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

Commit 694413d0 authored by Matthew Xie's avatar Matthew Xie
Browse files

resolved conflicts for merge of 2a557b87 to lmp-dev-plus-aosp 

Change-Id: I554820271db021bb20786e1ea1aee74822fddcb3
parents 9208ffd6 2a557b87

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,