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

Commit ae802531 authored by Weng Su's avatar Weng Su Committed by Android (Google) Code Review
Browse files

Merge "Fix the broken test on WifiSettingsTest" into sc-dev

parents 39bc92d1 b91aa1ed
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.os.Bundle;
import android.os.PowerManager;
import android.os.UserManager;
import android.provider.Settings;
import android.util.FeatureFlagUtils;
import android.view.ContextMenu;
import android.view.View;

@@ -105,6 +106,7 @@ public class WifiSettingsTest {
        mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext);
        mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker;
        mWifiSettings.mWifiManager = mWifiManager;
        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);
    }

    @Test
@@ -209,7 +211,7 @@ public class WifiSettingsTest {
        final Resources.Theme theme = mContext.getTheme();
        when(activity.getTheme()).thenReturn(theme);
        UserManager userManager = mock(UserManager.class);
        when(activity.getSystemService(UserManager.class))
        when(activity.getSystemService(Context.USER_SERVICE))
                .thenReturn(userManager);

        when(mWifiSettings.findPreference(WifiSettings.PREF_KEY_DATA_USAGE))