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

Commit 26b6382a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "SystemServer X FastBind: prevent double enable" into main

parents 02164365 fa465edd

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −1
Original line number Diff line number Diff line
@@ -4517,7 +4517,7 @@ public class AdapterService extends Service { 
            mHandler.post(() -> init());

        }



        debugLog("enable() - Enable called with quiet mode status =  " + quietMode);

        Log.i(TAG, "enable() - Enable called with quiet mode status =  " + quietMode);

        mQuietmode = quietMode;

        mAdapterStateMachine.sendMessage(AdapterState.BLE_TURN_ON);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1962,7 +1962,7 @@ class BluetoothManagerService { 
                        UserHandle.CURRENT)) {

                    mHandler.removeMessages(MESSAGE_TIMEOUT_BIND);

                }

            } else if (mAdapter != null) {

            } else if (!Flags.fastBindToApp() && mAdapter != null) {

                // Enable bluetooth

                try {

                    mAdapter.enable(mQuietEnable, mContext.getAttributionSource());