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

Commit 728fe22d authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify getBatteryLevel 

Bug: 145171640
Test: compile & run
Change-Id: Ie7a3537c03606a7f88c591e1cf26847880415b23
parent 11376273

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+5 −9
Original line number Diff line number Diff line
@@ -1841,7 +1841,11 @@ public class AdapterService extends Service { 


            enforceBluetoothPermission(service);



            return service.getBatteryLevel(device);

            DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);

            if (deviceProp == null) {

                return BluetoothDevice.BATTERY_LEVEL_UNKNOWN;

            }

            return deviceProp.getBatteryLevel();

        }



        @Override
@@ -2567,14 +2571,6 @@ public class AdapterService extends Service { 
        return deviceProp.getUuids();

    }



    int getBatteryLevel(BluetoothDevice device) {

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return BluetoothDevice.BATTERY_LEVEL_UNKNOWN;

        }

        return deviceProp.getBatteryLevel();

    }



    void logUserBondResponse(BluetoothDevice device, boolean accepted, int event) {

        StatsLog.write(StatsLog.BLUETOOTH_BOND_STATE_CHANGED,

                obfuscateAddress(device), 0, device.getType(),