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

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

Merge "Satellite: do not prevent disable during session" into main

parents e64840da b25775a9

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

+4 −11
Original line number Diff line number Diff line
@@ -1283,20 +1283,13 @@ class BluetoothManagerService { 
    }



    boolean disable(String packageName, boolean persist) {

        if (isSatelliteModeOn()) {

            Log.d(TAG, "disable: not disabling - satellite mode is on.");

            return false;

        }



        if (DBG) {

            Log.d(

                    TAG,

                    "disable(): mAdapter="

                            + mAdapter

                            + ", persist="

                            + persist

                            + ", isBinding="

                            + isBinding());

                    "disable():"

                            + (" mAdapter=" + mAdapter)

                            + (" persist=" + persist)

                            + (" isBinding=" + isBinding()));

        }



        synchronized (mReceiver) {