Resolved HSP PTS issues. When call is active, and CKPD is received: 1. If audio is...

Change-Id: Ib60f7109f9fe982523c3db68ea6014c25bad8262

diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index 2176bef..82c6ad6 100755 (executable)
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -1311,14 +1311,21 @@ final class HeadsetStateMachine extends StateMachine {
                 Log.e(TAG, "Handsfree phone proxy null for answering call");
             }
         } else if (mPhoneState.getNumActiveCall() > 0) {
-            if (mPhoneProxy != null) {
-                try {
-                    mPhoneProxy.answerCall();
-                } catch (RemoteException e) {
-                    Log.e(TAG, Log.getStackTraceString(new Throwable()));
+            if (!isAudioOn())
+            {
+                connectAudioNative(getByteAddress(mCurrentDevice));
+            }
+            else
+            {
+                if (mPhoneProxy != null) {
+                    try {
+                        mPhoneProxy.hangupCall();
+                    } catch (RemoteException e) {
+                        Log.e(TAG, Log.getStackTraceString(new Throwable()));
+                    }
+                } else {
+                    Log.e(TAG, "Handsfree phone proxy null for hangup call");
                 }
-            } else {
-                Log.e(TAG, "Handsfree phone proxy null for hangup call");
             }
         } else {
             String dialNumber = mPhonebook.getLastDialledNumber();