Show policy transparency dialog if adding Wi-Fi config is not allowed

- When the user is restricted by UserManager.DISALLOW_ADD_WIFI_CONFIG, clicking on a Wi-Fi network will show the Settings policy transparency dialog.

- The "Not allowed by your organization" summary in Wi-Fi networks will be removed in a separate CL.

Bug: 233871529
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=Wifi

Change-Id: Ia978be8e85a5809de1331f3e0edc11fbc8925c80
This commit is contained in:
Weng Su
2022-10-07 02:08:57 +08:00
parent a27418931c
commit a81bb19618
9 changed files with 68 additions and 42 deletions

View File

@@ -17,61 +17,56 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.UserManager;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowRestrictedPreference.class)
public class AddWifiNetworkPreferenceTest {
private Context mContext;
private AddWifiNetworkPreference mPreference;
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Spy
Context mContext = ApplicationProvider.getApplicationContext();
@Mock
private UserManager mUserManager;
private AddWifiNetworkPreference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
mPreference = new AddWifiNetworkPreference(mContext);
}
@Test
public void updatePreferenceForRestriction_isAddWifiConfigAllowed_prefIsEnabled() {
mPreference.mIsAddWifiConfigAllow = true;
// If the user is allowed to add Wi-Fi configuration then the EnforcedAdmin will be null.
RestrictedLockUtils.EnforcedAdmin enforcedAdmin = null;
mPreference.updatePreferenceForRestriction();
mPreference.setDisabledByAdmin(enforcedAdmin);
assertThat(mPreference.isEnabled()).isTrue();
assertThat(mPreference.getSummary()).isNull();
}
@Test
public void updatePreferenceForRestriction_isAddWifiConfigNotAllowed_prefIsDisabled() {
mPreference.mIsAddWifiConfigAllow = false;
RestrictedLockUtils.EnforcedAdmin enforcedAdmin = new RestrictedLockUtils.EnforcedAdmin(
null /* component */, UserManager.DISALLOW_ADD_WIFI_CONFIG, null /* user */);
mPreference.updatePreferenceForRestriction();
mPreference.setDisabledByAdmin(enforcedAdmin);
assertThat(mPreference.isEnabled()).isFalse();
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.not_allowed_by_ent));
}
}

View File

@@ -35,8 +35,10 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowRestrictedPreference.class)
public class ConnectedWifiEntryPreferenceTest {
@Mock

View File

@@ -36,8 +36,10 @@ import org.mockito.Spy;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowRestrictedPreference.class)
public class LongPressWifiEntryPreferenceTest {
@Rule

View File

@@ -0,0 +1,31 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.wifi;
import com.android.settingslib.RestrictedPreference;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@Implements(RestrictedPreference.class)
public class ShadowRestrictedPreference {
@Implementation
public void checkRestrictionAndSetDisabled(String userRestriction) {
// do nothing
}
}

View File

@@ -40,11 +40,13 @@ 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;

View File

@@ -70,6 +70,7 @@ import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowToast;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowRestrictedPreference.class)
public class WifiSettingsTest {
private static final int NUM_NETWORKS = 4;

View File

@@ -36,6 +36,7 @@ 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;
@@ -45,10 +46,12 @@ 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;