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

Commit 59fb9cca authored by Neha Jain's avatar Neha Jain Committed by Automerger Merge Worker
Browse files

Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: If854986d16aeca997c309da10b5153600131389e
parents c3d27dad abd0f6a5

src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java

+1 −1
Original line number Diff line number Diff line
@@ -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

    }



    /**

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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 {