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

Commit 944e3f7c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Satellite: do not prevent disable during session" into main am: 45434501 am: ef403b52 am: 6c6ff85a am: caece7dc

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



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

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