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

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

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

parents 3f8d62fb a81bb196

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

+4 −16
Original line number Diff line number Diff line
@@ -19,28 +19,25 @@ package com.android.settings.wifi; 
import android.content.Context;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.os.UserManager;

import android.util.Log;

import android.widget.ImageButton;



import androidx.annotation.DrawableRes;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.wifi.dpp.WifiDppUtils;

import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;

import com.android.settingslib.RestrictedPreference;



/**

 * The Preference for users to add Wi-Fi networks in WifiSettings

 */

public class AddWifiNetworkPreference extends Preference {

public class AddWifiNetworkPreference extends RestrictedPreference {



    private static final String TAG = "AddWifiNetworkPreference";



    private final Drawable mScanIconDrawable;

    @VisibleForTesting

    boolean mIsAddWifiConfigAllow;



    public AddWifiNetworkPreference(Context context) {

        super(context);
@@ -51,8 +48,7 @@ public class AddWifiNetworkPreference extends Preference { 
        setTitle(R.string.wifi_add_network);



        mScanIconDrawable = getDrawable(R.drawable.ic_scan_24dp);

        mIsAddWifiConfigAllow = WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(context);

        updatePreferenceForRestriction();

        checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);

    }



    @Override
@@ -79,12 +75,4 @@ public class AddWifiNetworkPreference extends Preference { 
        }

        return buttonIcon;

    }



    @VisibleForTesting

    void updatePreferenceForRestriction() {

        if (!mIsAddWifiConfigAllow) {

            setEnabled(false);

            setSummary(R.string.not_allowed_by_ent);

        }

    }

}

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

+5 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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;
@@ -30,10 +31,10 @@ import android.widget.TextView; 
import androidx.annotation.DrawableRes;

import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



import com.android.settingslib.R;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.Utils;

import com.android.settingslib.wifi.WifiUtils;

import com.android.wifitrackerlib.BaseWifiTracker;
@@ -42,7 +43,8 @@ import com.android.wifitrackerlib.WifiEntry; 
/**

 * Preference to display a WifiEntry in a wifi picker.

 */

public class WifiEntryPreference extends Preference implements WifiEntry.WifiEntryCallback,

public class WifiEntryPreference extends RestrictedPreference implements

        WifiEntry.WifiEntryCallback,

        View.OnClickListener {



    private static final int[] STATE_SECURED = {
@@ -86,6 +88,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt 
        mWifiEntry = wifiEntry;

        mWifiEntry.setListener(this);

        mIconInjector = iconInjector;

        checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);

        refresh();

    }
@@ -309,5 +312,4 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt 
        }

        return buttonIcon;

    }



}

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

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

    }

}

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

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

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

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