commit | 6bf17de1397da53b6c2caa12ab2fb8558a32cdf5 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 18 21:38:32 2021 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 18 21:38:32 2021 +0000 |
tree | 4aac9a2e603f8a12ace5ef7dfde18cd04dc9e3e7 | |
parent | abd0f6a5f6cfa4b9bff3ef3c02187f0720a7892f [diff] | |
parent | 509670cb0d3d67a2eb807e228334f251b3dbded1 [diff] |
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java index 107df5f..6657371 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java
@@ -175,7 +175,7 @@ */ @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 3f49938..92bfb38 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 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.Objects; import java.util.stream.Collectors; +@Ignore("b/191992001") @RunWith(RobolectricTestRunner.class) public class BluetoothDetailsCompanionAppsControllerTest extends BluetoothDetailsControllerTestBase {