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

Commit 0ed31dcf authored by Michał Narajowski's avatar Michał Narajowski
Browse files

CachedBluetoothDevice: Fix merge conflict 

Bug: 268587046
Test: atest CachedBluetoothDeviceTest
Merged-In: I9c50a7b759b7fbcd80f1f5706909ce0a6ddc5959
Change-Id: I46df1c8b43781dac076bc9a4a9f2ea32d20f6337
parent f9da437a

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,8 @@ public class CachedBluetoothDeviceTest { 
    @Mock

    @Mock

    private HearingAidProfile mHearingAidProfile;

    private HearingAidProfile mHearingAidProfile;

    @Mock

    @Mock

    private LeAudioProfile mLeAudioProfile;

    @Mock

    private BluetoothDevice mDevice;

    private BluetoothDevice mDevice;

    @Mock

    @Mock

    private BluetoothDevice mSubDevice;

    private BluetoothDevice mSubDevice;