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

parent b4a6188a

core/java/android/server/BluetoothDeviceService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -372,6 +372,10 @@ public class BluetoothDeviceService extends IBluetoothDevice.Stub {
		mEventLoop.onModeChanged(getModeNative());
		}

		if (mIsAirplaneSensitive && isAirplaneModeOn()) {
		disable(false);
		}

		}
		}