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

1 files changed, 9 insertions, 4 deletions

diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java
index 0f28b6b56..366674e96 100755
--- a/src/com/android/bluetooth/btservice/AdapterState.java
+++ b/src/com/android/bluetooth/btservice/AdapterState.java
@@ -80,6 +80,11 @@ final class AdapterState extends StateMachine {
         setInitialState(mOffState);
     }
 
+
+    public void doQuit() {
+        quitNow();
+    }
+
     public void cleanup() {
         if(mAdapterProperties != null)
             mAdapterProperties = null;
@@ -95,10 +100,6 @@ final class AdapterState extends StateMachine {
 
         @Override
         public boolean processMessage(Message msg) {
-            /* TODO(BT) if (msg.what == SM_QUIT_CMD) {
-                Log.d(TAG, "Received quit request...");
-                return false;
-                } */
 
             switch(msg.what) {
                case USER_TURN_ON:
@@ -130,6 +131,7 @@ final class AdapterState extends StateMachine {
 
         @Override
         public boolean processMessage(Message msg) {
+
             switch(msg.what) {
                case USER_TURN_OFF:
                    if (DBG) Log.d(TAG,"CURRENT_STATE=ON, MESSAGE = USER_TURN_OFF");
@@ -182,8 +184,10 @@ final class AdapterState extends StateMachine {
 
         @Override
         public boolean processMessage(Message msg) {
+
             boolean isTurningOn= isTurningOn();
             boolean isTurningOff = isTurningOff();
+
             switch (msg.what) {
                 case USER_TURN_ON:
                     if (DBG) Log.d(TAG,"CURRENT_STATE=PENDING, MESSAGE = USER_TURN_ON"
@@ -324,4 +328,5 @@ final class AdapterState extends StateMachine {
     private void errorLog(String msg) {
         Log.e(TAG, msg);
     }
+
 }