summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-11-25 15:10:54 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-11-25 15:10:54 -0800
commit42d1bd9840daa58962e172fafffc4f0c5b512656 (patch)
tree425c4ef189f96d5fc609e3129cd7b4ac687950d9
parentdcd023b28fb433bae0cd8fe308bb3a2fe21ce5cc (diff)
parentbb718bd85bc5524c9540ed0f5ee7bf0923e3250f (diff)
downloadandroid_packages_apps_Bluetooth-42d1bd9840daa58962e172fafffc4f0c5b512656.tar.gz
android_packages_apps_Bluetooth-42d1bd9840daa58962e172fafffc4f0c5b512656.tar.bz2
android_packages_apps_Bluetooth-42d1bd9840daa58962e172fafffc4f0c5b512656.zip
Merge "Bluetooth: Proper handling of BTRH command in HFP client"
-rw-r--r--src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
index a4bebaa2d..168019930 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
@@ -984,9 +984,6 @@ final class HeadsetClientStateMachine extends StateMachine {
}
break;
case BluetoothHeadsetClientCall.CALL_STATE_HELD_BY_RESPONSE_AND_HOLD:
- if (flag != BluetoothHeadsetClient.CALL_ACCEPT_NONE) {
- return;
- }
action = HeadsetClientHalConstants.CALL_ACTION_BTRH_1;
break;
case BluetoothHeadsetClientCall.CALL_STATE_ALERTING: