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

Commit 7223e477 authored by Liana Kazanova's avatar Liana Kazanova Committed by Gerrit Code Review
Browse files

Revert "SystemServer: SatelliteMode bypass thread jump" 

This reverts commit 9d3f3ac6.

Reason for revert: Droidmonitor: Potential culprit for b/349684439 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Ieb54281c9c1fd1f29b1177ef5a8ebfecb2e79551
parent 9d3f3ac6

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