summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michał Narajowski <narajn@google.com> 2023-03-06 13:34:43 +0000
committer Michał Narajowski <narajn@google.com> 2023-03-06 13:35:42 +0000
commit0ed31dcff196cb31db22bf67a617f1925f1e64fd (patch)
tree0da907135f0e91763226186ea5c61a255c229b8c
parentf9da437a5fcb84346a12bd0fac8659cc8f5dab59 (diff)
CachedBluetoothDevice: Fix merge conflict
Bug: 268587046 Test: atest CachedBluetoothDeviceTest Merged-In: I9c50a7b759b7fbcd80f1f5706909ce0a6ddc5959 Change-Id: I46df1c8b43781dac076bc9a4a9f2ea32d20f6337
-rw-r--r--packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java
index 315ab0aac878..3f19792f342c 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java
@@ -74,6 +74,8 @@ public class CachedBluetoothDeviceTest {
@Mock
private HearingAidProfile mHearingAidProfile;
@Mock
+ private LeAudioProfile mLeAudioProfile;
+ @Mock
private BluetoothDevice mDevice;
@Mock
private BluetoothDevice mSubDevice;