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

Commit 0ca89079 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "Fix broken SettingsSliceProviderTest"

parents d3582455 61db8635

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

+0 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ public class SettingsSliceProviderTest { 
    }



    @Test

    @Ignore

    @Config(shadows = ShadowStrictMode.class)

    public void onBindSlice_backgroundThread_shouldOverrideStrictMode() {

        ShadowThreadUtils.setIsMainThread(false);

tests/robotests/src/com/android/settings/testutils/FakeToggleController.java

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

tests/unit/src/com/android/settings/testutils/FakeToggleController.java

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