Merge "Fix for BT turn on/off issues: NPE, FD/thread leaks, ANR." into jb-mr1-dev

diff --cc src/com/android/bluetooth/a2dp/A2dpService.java
index 4441f4b,f223db9..2780232
--- 1/src/com/android/bluetooth/a2dp/A2dpService.java
--- 2/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@@ -50,9 -48,7 +50,8 @@@ public class A2dpService extends Profil
      protected boolean cleanup() {
          if (mStateMachine!= null) {
              mStateMachine.cleanup();
-             mStateMachine=null;
          }
 +        clearA2dpService();
          return true;
      }
  

diff --cc src/com/android/bluetooth/a2dp/A2dpStateMachine.java
index c742fd4,9b67eed..3004b5a
mode 100755,100644..100755
--- 1/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
--- 2/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
+++ b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java

diff --cc src/com/android/bluetooth/btservice/AdapterService.java
Simple merge

diff --cc src/com/android/bluetooth/btservice/AdapterState.java
Simple merge

diff --cc src/com/android/bluetooth/btservice/BondStateMachine.java
Simple merge

diff --cc src/com/android/bluetooth/hfp/HeadsetService.java
index 9f6f6da,9b0935d..9e9d71b
--- 1/src/com/android/bluetooth/hfp/HeadsetService.java
--- 2/src/com/android/bluetooth/hfp/HeadsetService.java
+++ b/src/com/android/bluetooth/hfp/HeadsetService.java
@@@ -72,9 -70,7 +72,8 @@@ public class HeadsetService extends Pro
      protected boolean cleanup() {
          if (mStateMachine != null) {
              mStateMachine.cleanup();
-             mStateMachine=null;
          }
 +        clearHeadsetService();
          return true;
      }
  

diff --cc src/com/android/bluetooth/hfp/HeadsetStateMachine.java
Simple merge

diff --cc src/com/android/bluetooth/hid/HidService.java
index 2f3c6de,5197f27..8bf9e1f
--- 1/src/com/android/bluetooth/hid/HidService.java
--- 2/src/com/android/bluetooth/hid/HidService.java
+++ b/src/com/android/bluetooth/hid/HidService.java
@@@ -86,9 -84,7 +86,8 @@@ public class HidService extends Profile
  
          if(mInputDevices != null) {
              mInputDevices.clear();
-             mInputDevices = null;
          }
 +        clearHidService();
          return true;
      }