PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine the check restriction function in WifiEntryPreference

Browse Source 
- Move checkRestrictionAndSetDisabled function from WifiEntryPreference to necessary child-classes to avoid impacting other child-classes such as SavedAccessPointsPreference.

- Avoid adding ShadowRestrictedPreference to the unnecessary test class.

Bug: 233871529
Test: manual test
make RunSettingsRoboTests

Change-Id: Ia2145401558b293b5f4eaa0860f83b7d3bbab548
This commit is contained in:
Weng Su
2022-10-13 03:52:08 +08:00
parent b0bef1c529
commit 10ef69316f
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/LongPressWifiEntryPreference.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import android.content.Context; import android.content.Context;
import android.os.UserManager;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@@ -33,6 +34,7 @@ public class LongPressWifiEntryPreference extends WifiEntryPreference {
public LongPressWifiEntryPreference(Context context, WifiEntry wifiEntry, Fragment fragment) { public LongPressWifiEntryPreference(Context context, WifiEntry wifiEntry, Fragment fragment) {
super(context, wifiEntry); super(context, wifiEntry);
mFragment = fragment; mFragment = fragment;
checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
} }
@Override @Override

2
src/com/android/settings/wifi/WifiEntryPreference.java
View File

@@ -21,7 +21,6 @@ import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.StateListDrawable; import android.graphics.drawable.StateListDrawable;
import android.os.UserManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.ImageButton; import android.widget.ImageButton;
@@ -88,7 +87,6 @@ public class WifiEntryPreference extends RestrictedPreference implements
mWifiEntry = wifiEntry; mWifiEntry = wifiEntry;
mWifiEntry.setListener(this); mWifiEntry.setListener(this);
mIconInjector = iconInjector; mIconInjector = iconInjector;
checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
refresh(); refresh();
} }

2
tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java
View File

@@ -40,13 +40,11 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowRestrictedPreference.class)
public class WifiEntryPreferenceTest { public class WifiEntryPreferenceTest {
private Context mContext; private Context mContext;

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

@@ -36,7 +36,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import com.android.settings.wifi.ShadowRestrictedPreference;
import com.android.settings.wifi.WifiEntryPreference; import com.android.settings.wifi.WifiEntryPreference;
import com.android.wifitrackerlib.SavedNetworkTracker; import com.android.wifitrackerlib.SavedNetworkTracker;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
@@ -46,12 +45,10 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import java.util.Arrays; import java.util.Arrays;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowRestrictedPreference.class)
public class WifiNetworkListFragmentTest { public class WifiNetworkListFragmentTest {
private WifiNetworkListFragment mWifiNetworkListFragment; private WifiNetworkListFragment mWifiNetworkListFragment;
private Context mContext; private Context mContext;