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

Commit 6e2af125 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add null check for AclStateChangedHandler"

parents 9f7fdc0d c4218061

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java

+4 −0
Original line number Diff line number Diff line
@@ -484,6 +484,10 @@ public class BluetoothEventManager { 
                return;

            }

            final CachedBluetoothDevice activeDevice = mDeviceManager.findDevice(device);

            if (activeDevice == null) {

                Log.w(TAG, "AclStateChangedHandler: activeDevice is null");

                return;

            }

            final int state;

            switch (action) {

                case BluetoothDevice.ACTION_ACL_CONNECTED:

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java

+13 −0
Original line number Diff line number Diff line
@@ -181,4 +181,17 @@ public class BluetoothEventManagerTest { 
        verify(mBluetoothCallback, never()).onAclConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothAdapter.STATE_CONNECTED);

    }



    @Test

    public void dispatchAclConnectionStateChanged_findDeviceReturnNull_shouldNotDispatchCallback() {

        when(mCachedDeviceManager.findDevice(mBluetoothDevice)).thenReturn(null);

        mBluetoothEventManager.registerCallback(mBluetoothCallback);

        mIntent = new Intent(BluetoothDevice.ACTION_ACL_CONNECTED);

        mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);



        mContext.sendBroadcast(mIntent);



        verify(mBluetoothCallback, never()).onAclConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothAdapter.STATE_CONNECTED);

    }

}