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

Commit f661e2e5 authored by William Escande's avatar William Escande
Browse files

BluetoothAdapter: cleanup 

no-op cleanup found after restoring BluetoothAdapterTest

Bug: 371656429
Test: atest CtsBluetoothTestCases
Flag: TEST_ONLY
Change-Id: I611f330a4ada51d529ff332fc2397922931391d1
parent 4521cb17

framework/java/android/bluetooth/BluetoothAdapter.java

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

        try {

            mManagerService.setAutoOnEnabled(status);

            mManagerService.setAutoOnEnabled(status);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }

    }

    }

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

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

                snoopMode = BluetoothProperties.snoop_log_mode_values.FULL;

                break;

                break;

            default:

            default:

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

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

                return BluetoothStatusCodes.ERROR_BAD_PARAMETERS;

        }

        }

        try {

        try {

            BluetoothProperties.snoop_log_mode(snoopMode);

            BluetoothProperties.snoop_log_mode(snoopMode);