From 0ed31dcff196cb31db22bf67a617f1925f1e64fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Narajowski?= <narajn@google.com>
Date: Mon, 6 Mar 2023 13:34:43 +0000
Subject: [PATCH] CachedBluetoothDevice: Fix merge conflict

Bug: 268587046
Test: atest CachedBluetoothDeviceTest
Merged-In: I9c50a7b759b7fbcd80f1f5706909ce0a6ddc5959
Change-Id: I46df1c8b43781dac076bc9a4a9f2ea32d20f6337
---
 .../settingslib/bluetooth/CachedBluetoothDeviceTest.java        | 2 ++
 1 file changed, 2 insertions(+)

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 315ab0aac878d..3f19792f342ce 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;