Merge "Merge "Disable Bluetooth if BLE was disabled while enabling" into... (8626f485) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -954,7 +954,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		}

		/**
		* Call IBluetooth.onLeServiceUp() to continue if Bluetooth should be on.
		* Call IBluetooth.onLeServiceUp() to continue if Bluetooth should be on,
		* call IBluetooth.onBrEdrDown() to disable if Bluetooth should be off.
		*/
		private void continueFromBleOnState() {
		if (DBG) {
		@@ -966,11 +967,10 @@ 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();
		if (!mEnableExternal && !isBleAppPresent()) {
		Slog.i(TAG, "Bluetooth was disabled while enabling BLE, disable BLE now");
		mEnable = false;
		mBluetooth.onBrEdrDown();
		return;
		}
		if (isBluetoothPersistedStateOnBluetooth() \|\| !isBleAppPresent()) {