Merge "Fix Bluetooth auto turns ON in airplane mode" am: 1b9f4dbd5d am: 4b6e138c0d

Change-Id: Ic88ce0c56206fdc9fb7c8ce7845e9592d02630c1

services/core/java/com/android/server/BluetoothManagerService.java

@@ -969,6 +969,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                 Slog.e(TAG, "onBluetoothServiceUp: mBluetooth is null!");
                 return;
             }
+            if (!mEnableExternal && !isBleAppPresent() && isAirplaneModeOn()) {
+                // Airplane mode is turned on while enabling BLE only mode, disable
+                // BLE now.
+                disableBleScanMode();
+                sendBrEdrDownCallback();
+                return;
+            }
             if (isBluetoothPersistedStateOnBluetooth() || !isBleAppPresent()) {
                 // This triggers transition to STATE_ON
                 mBluetooth.onLeServiceUp();