summaryrefslogtreecommitdiffstats
path: root/core/java/android/server/BluetoothDeviceService.java
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-07 21:42:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-06-07 21:42:14 -0700
commit58c244125fc2d2067bf89e67a154f6ca2421fe36 (patch)
treee98b8f00e08cff33d8469d1fdca933f733a0358f /core/java/android/server/BluetoothDeviceService.java
parent9d9953d94de4d17722ba2c768b92bd4ebeec908c (diff)
parent5c43f735d94a538dc273c8f859d1100a7cdd5c71 (diff)
downloadframeworks_base-58c244125fc2d2067bf89e67a154f6ca2421fe36.zip
frameworks_base-58c244125fc2d2067bf89e67a154f6ca2421fe36.tar.gz
frameworks_base-58c244125fc2d2067bf89e67a154f6ca2421fe36.tar.bz2
Merge change 3422 into donut
* changes: Check AirplaneMode when enabling Bluetooth has finished.
Diffstat (limited to 'core/java/android/server/BluetoothDeviceService.java')
-rw-r--r--core/java/android/server/BluetoothDeviceService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothDeviceService.java b/core/java/android/server/BluetoothDeviceService.java
index 8e5cee9..3a89abd 100644
--- a/core/java/android/server/BluetoothDeviceService.java
+++ b/core/java/android/server/BluetoothDeviceService.java
@@ -372,6 +372,10 @@ public class BluetoothDeviceService extends IBluetoothDevice.Stub {
mEventLoop.onModeChanged(getModeNative());
}
+ if (mIsAirplaneSensitive && isAirplaneModeOn()) {
+ disable(false);
+ }
+
}
}