From 61db863533e375ed00db30f4e1b47466f5d9939f Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Wed, 26 Jan 2022 16:06:55 +0800 Subject: [PATCH] Fix broken SettingsSliceProviderTest Fix: 214944418 Test: robotest Change-Id: Ib96bbcecbe9fab91ecae6fcaf32f90c11c3caced --- .../com/android/settings/slices/SettingsSliceProviderTest.java | 1 - .../com/android/settings/testutils/FakeToggleController.java | 3 ++- .../com/android/settings/testutils/FakeToggleController.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index 65be91f71f4..df38e7f72a0 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -246,7 +246,6 @@ public class SettingsSliceProviderTest { } @Test - @Ignore @Config(shadows = ShadowStrictMode.class) public void onBindSlice_backgroundThread_shouldOverrideStrictMode() { ShadowThreadUtils.setIsMainThread(false); diff --git a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java index 4e968a29c70..9ace6bb0cf0 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java @@ -21,13 +21,14 @@ import android.net.Uri; import android.net.wifi.WifiManager; import android.provider.Settings; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.slices.SliceBackgroundWorker; public class FakeToggleController extends TogglePreferenceController { public static final String AVAILABILITY_KEY = "fake_toggle_availability_key"; - public static final int HIGHLIGHT_MENU_RES = 5678; + public static final int HIGHLIGHT_MENU_RES = R.string.menu_key_about_device; public static final IntentFilter INTENT_FILTER = new IntentFilter( WifiManager.WIFI_AP_STATE_CHANGED_ACTION); diff --git a/tests/unit/src/com/android/settings/testutils/FakeToggleController.java b/tests/unit/src/com/android/settings/testutils/FakeToggleController.java index c232479d61c..a7e7320a96d 100644 --- a/tests/unit/src/com/android/settings/testutils/FakeToggleController.java +++ b/tests/unit/src/com/android/settings/testutils/FakeToggleController.java @@ -21,13 +21,14 @@ import android.net.Uri; import android.net.wifi.WifiManager; import android.provider.Settings; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.slices.SliceBackgroundWorker; public class FakeToggleController extends TogglePreferenceController { public static final String AVAILABILITY_KEY = "fake_toggle_availability_key"; - public static final int HIGHLIGHT_MENU_RES = 5678; + public static final int HIGHLIGHT_MENU_RES = R.string.menu_key_about_device; public static final IntentFilter INTENT_FILTER = new IntentFilter( WifiManager.WIFI_AP_STATE_CHANGED_ACTION);