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

Commit 4b3f3059 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Check against null device" into main am: 5c0457c9 am: 5155fea3 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2758306



Change-Id: Ife458bd4ccd8eeebd55d18b688517390807b9542
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79415175 5155fea3

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

+4 −0
Original line number Diff line number Diff line
@@ -236,6 +236,10 @@ public class RemoteDevices { 
    }



    DeviceProperties getDeviceProperties(BluetoothDevice device) {

        if (device == null) {

            return null;

        }



        synchronized (mDevices) {

            String address = mDualDevicesMap.get(device.getAddress());

            // If the device is not in the dual map, use its original address

android/app/tests/unit/src/com/android/bluetooth/btservice/RemoteDevicesTest.java

+6 −0
Original line number Diff line number Diff line
@@ -742,6 +742,12 @@ public class RemoteDevicesTest { 
        Assert.assertFalse(deviceProp.isCoordinatedSetMember());

    }



    @Test

    public void testIsDeviceNull() {

        Assert.assertNull(mRemoteDevices.getDeviceProperties(null));

    }





    private static void verifyBatteryLevelChangedIntent(BluetoothDevice device, int batteryLevel,

            ArgumentCaptor<Intent> intentArgument) {

        verifyBatteryLevelChangedIntent(device, batteryLevel, intentArgument.getValue());