Merge "Revert "SystemServer: SatelliteMode bypass thread jump"" into main (473c1195) · Commits · e / os / android_packages_modules_Bluetooth

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+3 −15

Original line number	Diff line number	Diff line
		@@ -459,28 +459,16 @@ class BluetoothManagerService {
		}

		if (currentState == STATE_ON) {
		mAdapterLock.readLock().lock();
		try {
		if (mAdapter != null) {
		mEnable = false;
		mEnableExternal = false;
		addActiveLog(reason, false);
		mAdapter.disable(mContext.getAttributionSource());
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Unable to call disable", e);
		} finally {
		mAdapterLock.readLock().unlock();
		}
		sendDisableMsg(reason);
		} else if (currentState == STATE_BLE_ON) {
		// If currentState is BLE_ON make sure we trigger stopBle
		mAdapterLock.readLock().lock();
		try {
		if (mAdapter != null) {
		mEnable = false;
		mEnableExternal = false;
		addActiveLog(reason, false);
		mAdapter.stopBle(mContext.getAttributionSource());
		mEnable = false;
		mEnableExternal = false;
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Unable to call stopBle", e);