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

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

Merge "BluetoothAdapter: cleanup" into main

parents 8959d2a7 f661e2e5

framework/java/android/bluetooth/BluetoothAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -5532,7 +5532,7 @@ public final class BluetoothAdapter { 
        try {

            mManagerService.setAutoOnEnabled(status);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -2402,8 +2402,7 @@ class BluetoothManagerService { 
                snoopMode = BluetoothProperties.snoop_log_mode_values.FULL;

                break;

            default:

                Log.e(TAG, "setBtHciSnoopLogMode: Not a valid mode:" + mode);

                return BluetoothStatusCodes.ERROR_BAD_PARAMETERS;

                throw new IllegalArgumentException("Invalid HCI snoop log mode param value");

        }

        try {

            BluetoothProperties.snoop_log_mode(snoopMode);