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

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

Merge "BluetoothManagerService -- Clear unused message"

parents a497114a 82db4998

framework/java/android/bluetooth/BluetoothAdapter.java

+0 −1
Original line number Diff line number Diff line
@@ -1560,7 +1560,6 @@ public final class BluetoothAdapter { 
            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public boolean disable(boolean persist) {



        try {

            return mManagerService.disable(mAttributionSource, persist);

        } catch (RemoteException e) {

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

+0 −8
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
    private static final int MESSAGE_RESTART_BLUETOOTH_SERVICE = 42;

    private static final int MESSAGE_BLUETOOTH_STATE_CHANGE = 60;

    private static final int MESSAGE_TIMEOUT_BIND = 100;

    private static final int MESSAGE_TIMEOUT_UNBIND = 101;

    private static final int MESSAGE_GET_NAME_AND_ADDRESS = 200;

    private static final int MESSAGE_USER_SWITCHED = 300;

    private static final int MESSAGE_USER_UNLOCKED = 301;
@@ -2494,13 +2493,6 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
                    mBluetoothLock.writeLock().unlock();

                    break;

                }

                case MESSAGE_TIMEOUT_UNBIND: {

                    Log.e(TAG, "MESSAGE_TIMEOUT_UNBIND");

                    mBluetoothLock.writeLock().lock();

                    mUnbinding = false;

                    mBluetoothLock.writeLock().unlock();

                    break;

                }



                case MESSAGE_USER_SWITCHED: {

                    if (DBG) {