diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-06-08 12:55:56 +0900 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-06-08 12:57:55 +0900 |
| commit | 5c43f735d94a538dc273c8f859d1100a7cdd5c71 (patch) | |
| tree | 1efec88c319f01703a21d790803bdef52ca627a6 /core/java/android/server | |
| parent | b4a6188a74273611abcae05f3a3b1f0547548301 (diff) | |
| download | frameworks_base-5c43f735d94a538dc273c8f859d1100a7cdd5c71.zip frameworks_base-5c43f735d94a538dc273c8f859d1100a7cdd5c71.tar.gz frameworks_base-5c43f735d94a538dc273c8f859d1100a7cdd5c71.tar.bz2 | |
Check AirplaneMode when enabling Bluetooth has finished.
This is part of manual merge from cupcake_dcm to donut.
Should be reviewed by mchan and takaoka.
Original internal CL: 149471-p9
Diffstat (limited to 'core/java/android/server')
| -rw-r--r-- | core/java/android/server/BluetoothDeviceService.java | 4 |
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); + } + } } |