Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6047ff27 authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

Merge "Revert "SystemServer: SatelliteMode bypass thread jump"" into main am:... 

Merge "Revert "SystemServer: SatelliteMode bypass thread jump"" into main am: 473c1195 am: 32060599

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3149051



Change-Id: Ib3e9b85a7828fb1f4021db9181835224c7653181
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f154d8ad 32060599

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

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

        }





        if (currentState == STATE_ON) {

        if (currentState == STATE_ON) {

            mAdapterLock.readLock().lock();

            sendDisableMsg(reason);

            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();

            }

        } else if (currentState == STATE_BLE_ON) {

        } else if (currentState == STATE_BLE_ON) {

            // If currentState is BLE_ON make sure we trigger stopBle

            // If currentState is BLE_ON make sure we trigger stopBle

            mAdapterLock.readLock().lock();

            mAdapterLock.readLock().lock();

            try {

            try {

                if (mAdapter != null) {

                if (mAdapter != null) {

                    mEnable = false;

                    mEnableExternal = false;

                    addActiveLog(reason, false);

                    addActiveLog(reason, false);

                    mAdapter.stopBle(mContext.getAttributionSource());

                    mAdapter.stopBle(mContext.getAttributionSource());

                    mEnable = false;

                    mEnableExternal = false;

                }

                }

            } catch (RemoteException e) {

            } catch (RemoteException e) {

                Log.e(TAG, "Unable to call stopBle", e);

                Log.e(TAG, "Unable to call stopBle", e);