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

Commit 981458c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refine the check restriction function in WifiEntryPreference"

parents cf26d6ba 10ef6931

src/com/android/settings/wifi/LongPressWifiEntryPreference.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.settings.wifi;



import android.content.Context;

import android.os.UserManager;



import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;
@@ -33,6 +34,7 @@ public class LongPressWifiEntryPreference extends WifiEntryPreference { 
    public LongPressWifiEntryPreference(Context context, WifiEntry wifiEntry, Fragment fragment) {

        super(context, wifiEntry);

        mFragment = fragment;

        checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);

    }



    @Override

src/com/android/settings/wifi/WifiEntryPreference.java

+0 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.StateListDrawable;

import android.os.UserManager;

import android.text.TextUtils;

import android.view.View;

import android.widget.ImageButton;
@@ -88,7 +87,6 @@ public class WifiEntryPreference extends RestrictedPreference implements 
        mWifiEntry = wifiEntry;

        mWifiEntry.setListener(this);

        mIconInjector = iconInjector;

        checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);

        refresh();

    }

tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java

+0 −2
Original line number Diff line number Diff line
@@ -40,13 +40,11 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import java.util.ArrayList;

import java.util.List;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = ShadowRestrictedPreference.class)

public class WifiEntryPreferenceTest {



    private Context mContext;

tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java

+0 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceCategory;

import androidx.test.InstrumentationRegistry;



import com.android.settings.wifi.ShadowRestrictedPreference;

import com.android.settings.wifi.WifiEntryPreference;

import com.android.wifitrackerlib.SavedNetworkTracker;

import com.android.wifitrackerlib.WifiEntry;
@@ -46,12 +45,10 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;



import java.util.Arrays;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = ShadowRestrictedPreference.class)

public class WifiNetworkListFragmentTest {

    private WifiNetworkListFragment mWifiNetworkListFragment;

    private Context mContext;