PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I04fdc7c76285de7ad43b83846de10a377eb4f151
This commit is contained in:
Neha Jain
2021-08-18 18:12:08 +00:00
committed by Automerger Merge Worker
parent 190603f53d abd0f6a5f6
commit bc0cf0d87f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
View File

@@ -175,7 +175,7 @@ public class BluetoothDetailsCompanionAppsController extends BluetoothDetailsCon
*/ */
@Override @Override
protected void refresh() { protected void refresh() {
updatePreferences(mContext, mCachedDevice.getAddress(), mProfilesContainer); // Do nothing. More details in b/191992001
} }
/** /**

2
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
View File

@@ -30,6 +30,7 @@ import android.content.pm.PackageManager;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -41,6 +42,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Ignore("b/191992001")
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class BluetoothDetailsCompanionAppsControllerTest extends public class BluetoothDetailsCompanionAppsControllerTest extends
BluetoothDetailsControllerTestBase { BluetoothDetailsControllerTestBase {