From cfbf0b03365ecad360ab237fa04963e9cbbaa991 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Fri, 6 Aug 2021 23:24:24 +0000
Subject: [PATCH] Remove CDM entries in Connected Device.

BUG: 191992001

Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
(cherry picked from commit 11655705dbce7ecc72ab800c107dcc51fd398f83)
---
 .../bluetooth/BluetoothDetailsCompanionAppsController.java      | 2 +-
 .../bluetooth/BluetoothDetailsCompanionAppsControllerTest.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
index 107df5fc50f..665737199b3 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
@@ -175,7 +175,7 @@ public class BluetoothDetailsCompanionAppsController extends BluetoothDetailsCon
      */
     @Override
     protected void refresh() {
-        updatePreferences(mContext, mCachedDevice.getAddress(), mProfilesContainer);
+        // Do nothing. More details in b/191992001
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
index 3f49938412b..92bfb38334f 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
@@ -30,6 +30,7 @@ import android.content.pm.PackageManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -41,6 +42,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+@Ignore("b/191992001")
 @RunWith(RobolectricTestRunner.class)
 public class BluetoothDetailsCompanionAppsControllerTest extends
         BluetoothDetailsControllerTestBase {