Merge "Disconnect HandsFree Profile Client on shutdown."
am: 24cb9704c2

Change-Id: I08e12d12289bbd79cbe2e9ea5e965cfb6140665e
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
index 125d3ef..18e2e96 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
@@ -776,6 +776,9 @@
 
     public void doQuit() {
         Log.d(TAG, "doQuit");
+        if (mCurrentDevice != null) {
+            NativeInterface.disconnectNative(getByteAddress(mCurrentDevice));
+        }
         routeHfpAudio(false);
         returnAudioFocusIfNecessary();
         quitNow();