am 58c24412: Merge change 3422 into donut

Merge commit '58c244125fc2d2067bf89e67a154f6ca2421fe36'

* commit '58c244125fc2d2067bf89e67a154f6ca2421fe36':
  Check AirplaneMode when enabling Bluetooth has finished.

core/java/android/server/BluetoothDeviceService.java

@@ -372,6 +372,10 @@ public class BluetoothDeviceService extends IBluetoothDevice.Stub {
                 mEventLoop.onModeChanged(getModeNative());
             }
 
+            if (mIsAirplaneSensitive && isAirplaneModeOn()) {
+                disable(false);
+            }
+
         }
     }