OSDN Git Service

comment out state machine quit call
authorMatthew Xie <mattx@google.com>
Tue, 12 Jun 2012 01:50:51 +0000 (18:50 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 Jul 2012 05:12:20 +0000 (22:12 -0700)
Change-Id: I0d4f72d50cd981a3c334583948dc0563f0662662

src/com/android/bluetooth/a2dp/A2dpService.java
src/com/android/bluetooth/btservice/AdapterService.java
src/com/android/bluetooth/btservice/AdapterState.java
src/com/android/bluetooth/btservice/BondStateMachine.java
src/com/android/bluetooth/hfp/HeadsetService.java

index bce55f7..4835890 100755 (executable)
@@ -41,7 +41,7 @@ public class A2dpService extends ProfileService {
     }
 
     protected boolean stop() {
-        mStateMachine.quit();
+        // TODO(BT) mStateMachine.quit();
         return true;
     }
 
index c4b97eb..6585e3f 100755 (executable)
@@ -388,13 +388,13 @@ public class AdapterService extends Service {
         mCleaningUp = true;
 
         if (mAdapterStateMachine != null) {
-            mAdapterStateMachine.quit();
+            // TODO(BT) mAdapterStateMachine.quit();
             mAdapterStateMachine.cleanup();
             mAdapterStateMachine = null;
         }
 
         if (mBondStateMachine != null) {
-            mBondStateMachine.quit();
+            // TODO(BT) mBondStateMachine.quit();
             mBondStateMachine.cleanup();
             mBondStateMachine = null;
         }
index 1e338e7..4c1c117 100755 (executable)
@@ -94,10 +94,10 @@ final class AdapterState extends StateMachine {
 
         @Override
         public boolean processMessage(Message msg) {
-            if (msg.what == SM_QUIT_CMD) {
+            /* TODO(BT) if (msg.what == SM_QUIT_CMD) {
                 Log.d(TAG, "Received quit request...");
                 return false;
-            }
+                } */
             int requestId = msg.arg1;
 
             switch(msg.what) {
index 400d49c..4627b77 100755 (executable)
@@ -73,10 +73,11 @@ final class BondStateMachine extends StateMachine {
 
         @Override
         public boolean processMessage(Message msg) {
-            if (msg.what == SM_QUIT_CMD) {
-                Log.d(TAG, "Received quit request...");
-                return false;
-            }
+            // TODO(BT)
+            // if (msg.what == SM_QUIT_CMD) {
+            //     Log.d(TAG, "Received quit request...");
+            //     return false;
+            // }
 
 
             BluetoothDevice dev = (BluetoothDevice)msg.obj;
@@ -125,10 +126,11 @@ final class BondStateMachine extends StateMachine {
 
         @Override
         public boolean processMessage(Message msg) {
-            if (msg.what == SM_QUIT_CMD) {
-                Log.d(TAG, "PendingCommandState(): Received quit request...");
-                return false;
-            }
+            // TODO(BT)
+            // if (msg.what == SM_QUIT_CMD) {
+            //     Log.d(TAG, "PendingCommandState(): Received quit request...");
+            //     return false;
+            // }
 
             BluetoothDevice dev = (BluetoothDevice)msg.obj;
             boolean result = false;
index 1bf9ee9..9991803 100755 (executable)
@@ -63,7 +63,7 @@ public class HeadsetService extends ProfileService {
         } catch (Exception e) {
             Log.w(TAG,"Unable to unregister headset receiver",e);
         }
-        mStateMachine.quit();
+        // TODO(BT) mStateMachine.quit();
         return true;
     }