Merge "Don't enable Bluetooth when booting into airplane mode."

2011-06-27 16:45:50 -07:00
parent 3111a317d3 aa6bd940f0
commit 6a04258745
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -209,9 +209,11 @@ class ServerThread extends Thread {
                                          bluetoothA2dp);
                bluetooth.initAfterA2dpRegistration();

+                int airplaneModeOn = Settings.System.getInt(mContentResolver,
+                        Settings.System.AIRPLANE_MODE_ON, 0);
                int bluetoothOn = Settings.Secure.getInt(mContentResolver,
                    Settings.Secure.BLUETOOTH_ON, 0);
-                if (bluetoothOn > 0) {
+                if (airplaneModeOn == 0 && bluetoothOn != 0) {
                    bluetooth.enable();
                }
            }