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

Commit fb23c6cf authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Remove duplicate code in disable BluetoothAdapter" am: f68f6213 am:... 

Merge "Remove duplicate code in disable BluetoothAdapter" am: f68f6213 am: dcc4de38 am: 28bbd070

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



Change-Id: I787d1856c085dbec4d01699a6136e37650e135d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1a06e02 28bbd070

framework/java/android/bluetooth/BluetoothAdapter.java

+1 −6
Original line number Diff line number Diff line
@@ -1592,12 +1592,7 @@ public final class BluetoothAdapter { 
    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean disable() {

        try {

            return mManagerService.disable(mAttributionSource, true);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        }

        return false;

        return disable(true);

    }



    /**