Merge "Check if BT is allowed in airplane mode"

1 files changed, 34 insertions, 5 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
index 353cadc3d..d358b8c22 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
@@ -43,6 +43,7 @@ import java.util.ArrayList;
 import android.app.Activity;
 import android.bluetooth.BluetoothDevicePicker;
 import android.content.Intent;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
@@ -118,7 +119,7 @@ public class BluetoothOppLauncherActivity extends Activity {
                 }
             }
 
-            if (isAirplaneModeOn()) {
+            if (!isBluetoothAllowed()) {
                 Intent in = new Intent(this, BluetoothOppBtErrorActivity.class);
                 in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 in.putExtra("title", this.getString(R.string.airplane_error_title));
@@ -164,11 +165,39 @@ public class BluetoothOppLauncherActivity extends Activity {
         finish();
     }
 
-    /* Returns true if airplane mode is currently on */
-    private final boolean isAirplaneModeOn() {
-        return Settings.System.getInt(this.getContentResolver(), Settings.System.AIRPLANE_MODE_ON,
-                0) == 1;
+    /* Returns true if Bluetooth is allowed given current airplane mode settings. */
+    private final boolean isBluetoothAllowed() {
+        final ContentResolver resolver = this.getContentResolver();
+
+        // Check if airplane mode is on
+        final boolean isAirplaneModeOn = Settings.System.getInt(resolver,
+                Settings.System.AIRPLANE_MODE_ON, 0) == 1;
+        if (!isAirplaneModeOn) {
+            return true;
+        }
+
+        // Check if airplane mode matters
+        final String airplaneModeRadios = Settings.System.getString(resolver,
+                Settings.System.AIRPLANE_MODE_RADIOS);
+        final boolean isAirplaneSensitive = airplaneModeRadios == null ? true :
+                airplaneModeRadios.contains(Settings.System.RADIO_BLUETOOTH);
+        if (!isAirplaneSensitive) {
+            return true;
+        }
+
+        // Check if Bluetooth may be enabled in airplane mode
+        final String airplaneModeToggleableRadios = Settings.System.getString(resolver,
+                Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+        final boolean isAirplaneToggleable = airplaneModeToggleableRadios == null ? false :
+                airplaneModeToggleableRadios.contains(Settings.System.RADIO_BLUETOOTH);
+        if (isAirplaneToggleable) {
+            return true;
+        }
+
+        // If we get here we're not allowed to use Bluetooth right now
+        return false;
     }
+
     private Uri creatFileForSharedContent(Context context, CharSequence shareContent) {
         if (shareContent == null) {
             return null;