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

Commit e76a4104 authored by Zach Johnson's avatar Zach Johnson
Browse files

Call parameterized version of IBluetooth.enable 

Bug: 145171640
Test: compile & verify starts
Change-Id: I725d1b81b78455b7febe250161d9eb9859434d2a
parent b997c1f1

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

+4 −16
Original line number Diff line number Diff line
@@ -1751,15 +1751,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 


                        //Do enable request

                        try {

                            if (!mQuietEnable) {

                                if (!mBluetooth.enable()) {

                            if (!mBluetooth.enable(mQuietEnable)) {

                                Slog.e(TAG, "IBluetooth.enable() returned false");

                            }

                            } else {

                                if (!mBluetooth.enableNoAutoConnect()) {

                                    Slog.e(TAG, "IBluetooth.enableNoAutoConnect() returned false");

                                }

                            }

                        } catch (RemoteException e) {

                            Slog.e(TAG, "Unable to call enable()", e);

                        }
@@ -2027,15 +2021,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
            } else if (mBluetooth != null) {

                //Enable bluetooth

                try {

                    if (!mQuietEnable) {

                        if (!mBluetooth.enable()) {

                    if (!mBluetooth.enable(mQuietEnable)) {

                        Slog.e(TAG, "IBluetooth.enable() returned false");

                    }

                    } else {

                        if (!mBluetooth.enableNoAutoConnect()) {

                            Slog.e(TAG, "IBluetooth.enableNoAutoConnect() returned false");

                        }

                    }

                } catch (RemoteException e) {

                    Slog.e(TAG, "Unable to call enable()", e);

                }