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

Commit b2573892 authored by George Lu's avatar George Lu Committed by android-build-merger
Browse files

Merge "Restore HeadsetClientStateMachine.getCurrentAgFeatures() reporting of... 

Merge "Restore HeadsetClientStateMachine.getCurrentAgFeatures() reporting of EXTRA_AG_FEATURE_VOICE_RECOGNITION." am: 7fc43f94
am: 86734be0

Change-Id: Ie35e8977407d608aef6a142ffe45756f350173e6
parents 50f7408c 86734be0

src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+8 −0
Original line number Diff line number Diff line
@@ -658,6 +658,10 @@ public class HeadsetClientStateMachine extends StateMachine { 
                == HeadsetClientHalConstants.PEER_FEAT_3WAY) {

            b.putBoolean(BluetoothHeadsetClient.EXTRA_AG_FEATURE_3WAY_CALLING, true);

        }

        if ((mPeerFeatures & HeadsetClientHalConstants.PEER_FEAT_VREC)

                == HeadsetClientHalConstants.PEER_FEAT_VREC) {

            b.putBoolean(BluetoothHeadsetClient.EXTRA_AG_FEATURE_VOICE_RECOGNITION, true);

        }

        if ((mPeerFeatures & HeadsetClientHalConstants.PEER_FEAT_REJECT)

                == HeadsetClientHalConstants.PEER_FEAT_REJECT) {

            b.putBoolean(BluetoothHeadsetClient.EXTRA_AG_FEATURE_REJECT_CALL, true);
@@ -1782,6 +1786,10 @@ public class HeadsetClientStateMachine extends StateMachine { 
                    == HeadsetClientHalConstants.PEER_FEAT_3WAY) {

                intent.putExtra(BluetoothHeadsetClient.EXTRA_AG_FEATURE_3WAY_CALLING, true);

            }

            if ((mPeerFeatures & HeadsetClientHalConstants.PEER_FEAT_VREC)

                    == HeadsetClientHalConstants.PEER_FEAT_VREC) {

                intent.putExtra(BluetoothHeadsetClient.EXTRA_AG_FEATURE_VOICE_RECOGNITION, true);

            }

            if ((mPeerFeatures & HeadsetClientHalConstants.PEER_FEAT_REJECT)

                    == HeadsetClientHalConstants.PEER_FEAT_REJECT) {

                intent.putExtra(BluetoothHeadsetClient.EXTRA_AG_FEATURE_REJECT_CALL, true);