Updated the AdapterState class to handle persisted Bluetooth setting after AIRPLANE...

Change-Id: I5e1ca111b72ff49498e87149c32769997e545c54

diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index fd2dca2..6fd859e 100755 (executable)
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -471,7 +471,7 @@ public class AdapterService extends Application {
         Binder.restoreCallingIdentity(origCallerIdentityToken);
     }
 
-    private boolean getBluetoothPersistedSetting() {
+    boolean getBluetoothPersistedSetting() {
         ContentResolver contentResolver = mContext.getContentResolver();
         return (Settings.Secure.getInt(contentResolver,
                                        Settings.Secure.BLUETOOTH_ON, 0) > 0);

diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java
index 5314509..11bdbfe 100644 (file)
--- a/src/com/android/bluetooth/btservice/AdapterState.java
+++ b/src/com/android/bluetooth/btservice/AdapterState.java
@@ -81,9 +81,26 @@ final class AdapterState extends StateMachine {
                        transitionTo(mPendingCommandState);
                    }
                    break;
+               case AIRPLANE_MODE_OFF:
+               {
+                   if(mAdapterService.getBluetoothPersistedSetting()) {
+                        Log.i(TAG, "OffState : Turning BT on after Airplane"+
+                            " Mode OFF state");
+                        sendIntent(BluetoothAdapter.STATE_TURNING_ON);
+                        ret = mAdapterService.enableNative();
+                        if (!ret) {
+                            Log.e(TAG, "Error while turning Bluetooth On");
+                            sendIntent(BluetoothAdapter.STATE_OFF);
+                        } else {
+                            sendMessageDelayed(ENABLE_TIMEOUT,
+                                ENABLE_TIMEOUT_DELAY);
+                            transitionTo(mPendingCommandState);
+                        }
+                   }
+                   break;
+               }
                case USER_TURN_OFF:
                case AIRPLANE_MODE_ON:
-               case AIRPLANE_MODE_OFF:
                    //ignore
                    break;
                default: