Snap for 8465404 from 7d5fd430c8845822ae1d325db9c84ce4267d3176 to tm-qpr1-release (89c05da2) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/WifiEnterpriseRestrictionUtils.java

+10 −23

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.settingslib.wifi;

	import android.content.Context;		import android.content.Context;
	import android.os.Build;		import android.os.Build;
	import android.os.Bundle;
	import android.os.UserManager;		import android.os.UserManager;
	import android.util.Log;		import android.util.Log;

	@@ -37,14 +36,10 @@ public class WifiEnterpriseRestrictionUtils {
	* @return whether the device is permitted to use Wi-Fi Tethering		* @return whether the device is permitted to use Wi-Fi Tethering
	*/		*/
	public static boolean isWifiTetheringAllowed(Context context) {		public static boolean isWifiTetheringAllowed(Context context) {
	final UserManager userManager = context.getSystemService(UserManager.class);		if (!hasUserRestrictionFromT(context, UserManager.DISALLOW_WIFI_TETHERING)) return true;
	final Bundle restrictions = userManager.getUserRestrictions();		Log.w(TAG, "Wi-Fi Tethering isn't available due to user restriction.");
	if (isAtLeastT() && restrictions.getBoolean(UserManager.DISALLOW_WIFI_TETHERING)) {
	Log.i(TAG, "Wi-Fi Tethering isn't available due to user restriction.");
	return false;		return false;
	}		}
	return true;
	}

	/**		/**
	* Confirm Wi-Fi Direct is allowed according to whether user restriction is set		* Confirm Wi-Fi Direct is allowed according to whether user restriction is set
	@@ -53,14 +48,10 @@ public class WifiEnterpriseRestrictionUtils {
	* @return whether the device is permitted to use Wi-Fi Direct		* @return whether the device is permitted to use Wi-Fi Direct
	*/		*/
	public static boolean isWifiDirectAllowed(Context context) {		public static boolean isWifiDirectAllowed(Context context) {
	final UserManager userManager = context.getSystemService(UserManager.class);		if (!hasUserRestrictionFromT(context, UserManager.DISALLOW_WIFI_DIRECT)) return true;
	final Bundle restrictions = userManager.getUserRestrictions();		Log.w(TAG, "Wi-Fi Direct isn't available due to user restriction.");
	if (isAtLeastT() && restrictions.getBoolean(UserManager.DISALLOW_WIFI_DIRECT)) {
	Log.i(TAG, "Wi-Fi Direct isn't available due to user restriction.");
	return false;		return false;
	}		}
	return true;
	}

	/**		/**
	* Confirm Wi-Fi Config is allowed to add according to whether user restriction is set		* Confirm Wi-Fi Config is allowed to add according to whether user restriction is set
	@@ -69,14 +60,10 @@ public class WifiEnterpriseRestrictionUtils {
	* @return whether the device is permitted to add new Wi-Fi config		* @return whether the device is permitted to add new Wi-Fi config
	*/		*/
	public static boolean isAddWifiConfigAllowed(Context context) {		public static boolean isAddWifiConfigAllowed(Context context) {
	final UserManager userManager = context.getSystemService(UserManager.class);		if (!hasUserRestrictionFromT(context, UserManager.DISALLOW_ADD_WIFI_CONFIG)) return true;
	final Bundle restrictions = userManager.getUserRestrictions();		Log.w(TAG, "Wi-Fi Add network isn't available due to user restriction.");
	if (isAtLeastT() && restrictions.getBoolean(UserManager.DISALLOW_ADD_WIFI_CONFIG)) {
	Log.i(TAG, "Wi-Fi Add network isn't available due to user restriction.");
	return false;		return false;
	}		}
	return true;
	}

	/**		/**
	* Confirm Wi-Fi state is allowed to change to whether user restriction is set		* Confirm Wi-Fi state is allowed to change to whether user restriction is set

packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiEnterpriseRestrictionUtilsTest.java

+31 −63

Original line number	Original line	Diff line number	Diff line
	@@ -15,122 +15,91 @@
	*/		*/
	package com.android.settingslib.wifi;		package com.android.settingslib.wifi;

			import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
	import static android.os.UserManager.DISALLOW_CHANGE_WIFI_STATE;		import static android.os.UserManager.DISALLOW_CHANGE_WIFI_STATE;
			import static android.os.UserManager.DISALLOW_WIFI_DIRECT;
			import static android.os.UserManager.DISALLOW_WIFI_TETHERING;

	import static com.google.common.truth.Truth.assertThat;		import static com.google.common.truth.Truth.assertThat;

	import static org.mockito.ArgumentMatchers.anyString;		import static org.mockito.ArgumentMatchers.anyString;
	import static org.mockito.Mockito.spy;
	import static org.mockito.Mockito.when;		import static org.mockito.Mockito.when;

	import android.content.Context;		import android.content.Context;
	import android.os.Build;		import android.os.Build;
	import android.os.Bundle;
	import android.os.UserManager;		import android.os.UserManager;

	import androidx.test.core.app.ApplicationProvider;		import androidx.test.core.app.ApplicationProvider;

	import org.junit.Before;		import org.junit.Before;
			import org.junit.Rule;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	import org.mockito.Mock;		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.RobolectricTestRunner;
	import org.robolectric.util.ReflectionHelpers;		import org.robolectric.util.ReflectionHelpers;

	@RunWith(RobolectricTestRunner.class)		@RunWith(RobolectricTestRunner.class)
	public class WifiEnterpriseRestrictionUtilsTest {		public class WifiEnterpriseRestrictionUtilsTest {

	private Context mContext;		static final String SDK_INT = "SDK_INT";
			static final int VERSION_CODES_S = Build.VERSION_CODES.S;
			static final int VERSION_CODES_T = Build.VERSION_CODES.TIRAMISU;

			@Rule
			public final MockitoRule mMockitoRule = MockitoJUnit.rule();
			@Spy
			Context mContext = ApplicationProvider.getApplicationContext();
	@Mock		@Mock
	private UserManager mUserManager;		private UserManager mUserManager;
	@Mock
	private Bundle mBundle;

	@Before		@Before
	public void setUp() {		public void setUp() {
	MockitoAnnotations.initMocks(this);
	mContext = spy(ApplicationProvider.getApplicationContext());
	when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);		when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
	when(mUserManager.getUserRestrictions()).thenReturn(mBundle);		ReflectionHelpers.setStaticField(Build.VERSION.class, SDK_INT, VERSION_CODES_T);
	ReflectionHelpers.setStaticField(
	Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.TIRAMISU);
	}		}

	@Test		@Test
	public void isWifiTetheringAllowed_setSDKForS_shouldReturnTrue() {		public void isWifiTetheringAllowed_hasDisallowRestriction_shouldReturnFalse() {
	ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.S);		when(mUserManager.hasUserRestriction(DISALLOW_WIFI_TETHERING)).thenReturn(true);
	when(mBundle.getBoolean(UserManager.DISALLOW_WIFI_TETHERING)).thenReturn(true);

	assertThat(WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(mContext)).isTrue();
	}

	@Test
	public void isWifiTetheringAllowed_setSDKForTAndDisallowForRestriction_shouldReturnFalse() {
	ReflectionHelpers.setStaticField(
	Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.TIRAMISU);
	when(mBundle.getBoolean(UserManager.DISALLOW_WIFI_TETHERING)).thenReturn(true);

	assertThat(WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(mContext)).isFalse();		assertThat(WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(mContext)).isFalse();
	}		}

	@Test		@Test
	public void isWifiTetheringAllowed_setSDKForTAndAllowForRestriction_shouldReturnTrue() {		public void isWifiTetheringAllowed_noDisallowRestriction_shouldReturnTrue() {
	ReflectionHelpers.setStaticField(		when(mUserManager.hasUserRestriction(DISALLOW_WIFI_TETHERING)).thenReturn(false);
	Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.TIRAMISU);
	when(mBundle.getBoolean(UserManager.DISALLOW_WIFI_TETHERING)).thenReturn(false);

	assertThat(WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(mContext)).isTrue();		assertThat(WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(mContext)).isTrue();
	}		}

	@Test		@Test
	public void isWifiDirectAllowed_setSDKForS_shouldReturnTrue() {		public void isWifiDirectAllowed_hasDisallowRestriction_shouldReturnFalse() {
	ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.S);		when(mUserManager.hasUserRestriction(DISALLOW_WIFI_DIRECT)).thenReturn(true);
	when(mBundle.getBoolean(UserManager.DISALLOW_WIFI_DIRECT)).thenReturn(true);

	assertThat(WifiEnterpriseRestrictionUtils.isWifiDirectAllowed(mContext)).isTrue();
	}

	@Test
	public void isWifiDirectAllowed_setSDKForTAndDisallowForRestriction_shouldReturnFalse() {
	ReflectionHelpers.setStaticField(
	Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.TIRAMISU);
	when(mBundle.getBoolean(UserManager.DISALLOW_WIFI_DIRECT)).thenReturn(true);

	assertThat(WifiEnterpriseRestrictionUtils.isWifiDirectAllowed(mContext)).isFalse();		assertThat(WifiEnterpriseRestrictionUtils.isWifiDirectAllowed(mContext)).isFalse();
	}		}

	@Test		@Test
	public void isWifiDirectAllowed_setSDKForTAndAllowForRestriction_shouldReturnTrue() {		public void isWifiDirectAllowed_noDisallowRestriction_shouldReturnTrue() {
	ReflectionHelpers.setStaticField(		when(mUserManager.hasUserRestriction(DISALLOW_WIFI_DIRECT)).thenReturn(false);
	Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.TIRAMISU);
	when(mBundle.getBoolean(UserManager.DISALLOW_WIFI_DIRECT)).thenReturn(false);

	assertThat(WifiEnterpriseRestrictionUtils.isWifiDirectAllowed(mContext)).isTrue();		assertThat(WifiEnterpriseRestrictionUtils.isWifiDirectAllowed(mContext)).isTrue();
	}		}

	@Test		@Test
	public void isAddWifiConfigAllowed_setSDKForS_shouldReturnTrue() {		public void isAddWifiConfigAllowed_hasDisallowRestriction_shouldReturnFalse() {
	ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.S);		when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);
	when(mBundle.getBoolean(UserManager.DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);

	assertThat(WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(mContext)).isTrue();
	}

	@Test
	public void isAddWifiConfigAllowed_setSDKForTAndDisallowForRestriction_shouldReturnFalse() {
	ReflectionHelpers.setStaticField(
	Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.TIRAMISU);
	when(mBundle.getBoolean(UserManager.DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);

	assertThat(WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(mContext)).isFalse();		assertThat(WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(mContext)).isFalse();
	}		}

	@Test		@Test
	public void isAddWifiConfigAllowed_setSDKForTAndAllowForRestriction_shouldReturnTrue() {		public void isAddWifiConfigAllowed_noDisallowRestriction_shouldReturnTrue() {
	ReflectionHelpers.setStaticField(		when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);
	Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.TIRAMISU);
	when(mBundle.getBoolean(UserManager.DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);

	assertThat(WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(mContext)).isTrue();		assertThat(WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(mContext)).isTrue();
	}		}
	@@ -143,7 +112,7 @@ public class WifiEnterpriseRestrictionUtilsTest {
	}		}

	@Test		@Test
	public void isChangeWifiStateAllowed_hasNoDisallowRestriction_shouldReturnTrue() {		public void isChangeWifiStateAllowed_noDisallowRestriction_shouldReturnTrue() {
	when(mUserManager.hasUserRestriction(DISALLOW_CHANGE_WIFI_STATE)).thenReturn(false);		when(mUserManager.hasUserRestriction(DISALLOW_CHANGE_WIFI_STATE)).thenReturn(false);

	assertThat(WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(mContext)).isTrue();		assertThat(WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(mContext)).isTrue();
	@@ -151,7 +120,7 @@ public class WifiEnterpriseRestrictionUtilsTest {

	@Test		@Test
	public void hasUserRestrictionFromT_setSDKForS_shouldReturnTrue() {		public void hasUserRestrictionFromT_setSDKForS_shouldReturnTrue() {
	ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.S);		ReflectionHelpers.setStaticField(Build.VERSION.class, SDK_INT, VERSION_CODES_S);

	assertThat(WifiEnterpriseRestrictionUtils.hasUserRestrictionFromT(mContext, "key"))		assertThat(WifiEnterpriseRestrictionUtils.hasUserRestrictionFromT(mContext, "key"))
	.isFalse();		.isFalse();
	@@ -159,8 +128,7 @@ public class WifiEnterpriseRestrictionUtilsTest {

	@Test		@Test
	public void hasUserRestrictionFromT_setSDKForT_shouldReturnHasUserRestriction() {		public void hasUserRestrictionFromT_setSDKForT_shouldReturnHasUserRestriction() {
	ReflectionHelpers.setStaticField(		ReflectionHelpers.setStaticField(Build.VERSION.class, SDK_INT, VERSION_CODES_T);
	Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.TIRAMISU);
	when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);		when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);

	assertThat(WifiEnterpriseRestrictionUtils.hasUserRestrictionFromT(mContext, "key"))		assertThat(WifiEnterpriseRestrictionUtils.hasUserRestrictionFromT(mContext, "key"))

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+15 −6

Original line number	Original line	Diff line number	Diff line
	@@ -198,20 +198,29 @@
	android:clickable="false"		android:clickable="false"
	android:focusable="false">		android:focusable="false">

	<FrameLayout		<LinearLayout
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
	android:layout_weight="1"		android:layout_weight="1"
			android:gravity="start\|center_vertical"
	android:orientation="vertical"		android:orientation="vertical"
	android:clickable="false"		android:clickable="false">
	android:layout_width="wrap_content"
	android:layout_height="match_parent">
	<TextView		<TextView
	android:id="@+id/wifi_toggle_title"		android:id="@+id/wifi_toggle_title"
	android:text="@string/turn_on_wifi"		android:text="@string/turn_on_wifi"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="match_parent"		android:layout_height="wrap_content"
	android:gravity="start\|center_vertical"		android:gravity="start\|center_vertical"
	android:textAppearance="@style/TextAppearance.InternetDialog"/>		android:textAppearance="@style/TextAppearance.InternetDialog"/>
	</FrameLayout>		<TextView
			android:id="@+id/wifi_toggle_summary"
			android:text="@string/wifitrackerlib_admin_restricted_network"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:gravity="start\|center_vertical"
			android:textAppearance="@style/TextAppearance.InternetDialog.Secondary"
			android:visibility="gone"/>
			</LinearLayout>

	<FrameLayout		<FrameLayout
	android:layout_width="@dimen/settingslib_switch_track_width"		android:layout_width="@dimen/settingslib_switch_track_width"

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,7 @@ import androidx.recyclerview.widget.RecyclerView;
	import com.android.internal.logging.UiEvent;		import com.android.internal.logging.UiEvent;
	import com.android.internal.logging.UiEventLogger;		import com.android.internal.logging.UiEventLogger;
	import com.android.settingslib.Utils;		import com.android.settingslib.Utils;
			import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
	import com.android.systemui.Prefs;		import com.android.systemui.Prefs;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.accessibility.floatingmenu.AnnotationLinkSpan;		import com.android.systemui.accessibility.floatingmenu.AnnotationLinkSpan;
	@@ -136,6 +137,7 @@ public class InternetDialog extends SystemUIDialog implements
	private Drawable mBackgroundOff = null;		private Drawable mBackgroundOff = null;
	private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;		private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
	private boolean mCanConfigMobileData;		private boolean mCanConfigMobileData;
			private boolean mCanChangeWifiState;

	// Wi-Fi entries		// Wi-Fi entries
	private int mWifiNetworkHeight;		private int mWifiNetworkHeight;
	@@ -180,6 +182,7 @@ public class InternetDialog extends SystemUIDialog implements
	mWifiManager = mInternetDialogController.getWifiManager();		mWifiManager = mInternetDialogController.getWifiManager();
	mCanConfigMobileData = canConfigMobileData;		mCanConfigMobileData = canConfigMobileData;
	mCanConfigWifi = canConfigWifi;		mCanConfigWifi = canConfigWifi;
			mCanChangeWifiState = WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(context);
	mKeyguard = keyguardStateController;		mKeyguard = keyguardStateController;

	mUiEventLogger = uiEventLogger;		mUiEventLogger = uiEventLogger;
	@@ -449,6 +452,14 @@ public class InternetDialog extends SystemUIDialog implements
	}		}
	mTurnWifiOnLayout.setBackground(		mTurnWifiOnLayout.setBackground(
	(isDeviceLocked && mConnectedWifiEntry != null) ? mBackgroundOn : null);		(isDeviceLocked && mConnectedWifiEntry != null) ? mBackgroundOn : null);

			if (!mCanChangeWifiState && mWiFiToggle.isEnabled()) {
			mWiFiToggle.setEnabled(false);
			mWifiToggleTitleText.setEnabled(false);
			final TextView summaryText = mDialogView.requireViewById(R.id.wifi_toggle_summary);
			summaryText.setEnabled(false);
			summaryText.setVisibility(View.VISIBLE);
			}
	}		}

	@MainThread		@MainThread

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java

+47 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,12 +21,15 @@ import android.testing.AndroidTestingRunner;
	import android.testing.TestableLooper;		import android.testing.TestableLooper;
	import android.view.View;		import android.view.View;
	import android.widget.LinearLayout;		import android.widget.LinearLayout;
			import android.widget.Switch;
	import android.widget.TextView;		import android.widget.TextView;

	import androidx.recyclerview.widget.RecyclerView;		import androidx.recyclerview.widget.RecyclerView;
	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;

			import com.android.dx.mockito.inline.extended.ExtendedMockito;
	import com.android.internal.logging.UiEventLogger;		import com.android.internal.logging.UiEventLogger;
			import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.SysuiTestCase;		import com.android.systemui.SysuiTestCase;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;
	@@ -42,6 +45,7 @@ import org.mockito.ArgumentCaptor;
	import org.mockito.Mock;		import org.mockito.Mock;
	import org.mockito.Mockito;		import org.mockito.Mockito;
	import org.mockito.MockitoAnnotations;		import org.mockito.MockitoAnnotations;
			import org.mockito.MockitoSession;

	import java.util.List;		import java.util.List;

	@@ -79,12 +83,16 @@ public class InternetDialogTest extends SysuiTestCase {
	private LinearLayout mEthernet;		private LinearLayout mEthernet;
	private LinearLayout mMobileDataToggle;		private LinearLayout mMobileDataToggle;
	private LinearLayout mWifiToggle;		private LinearLayout mWifiToggle;
			private Switch mWifiToggleSwitch;
			private TextView mWifiToggleSummary;
	private LinearLayout mConnectedWifi;		private LinearLayout mConnectedWifi;
	private RecyclerView mWifiList;		private RecyclerView mWifiList;
	private LinearLayout mSeeAll;		private LinearLayout mSeeAll;
	private LinearLayout mWifiScanNotify;		private LinearLayout mWifiScanNotify;
	private TextView mAirplaneModeSummaryText;		private TextView mAirplaneModeSummaryText;

			private MockitoSession mMockitoSession;

	@Before		@Before
	public void setUp() {		public void setUp() {
	MockitoAnnotations.initMocks(this);		MockitoAnnotations.initMocks(this);
	@@ -101,6 +109,15 @@ public class InternetDialogTest extends SysuiTestCase {
	.thenReturn(MOBILE_NETWORK_SUMMARY);		.thenReturn(MOBILE_NETWORK_SUMMARY);
	when(mInternetDialogController.getWifiManager()).thenReturn(mWifiManager);		when(mInternetDialogController.getWifiManager()).thenReturn(mWifiManager);

			mMockitoSession = ExtendedMockito.mockitoSession()
			.spyStatic(WifiEnterpriseRestrictionUtils.class)
			.startMocking();
			when(WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(mContext)).thenReturn(true);

			createInternetDialog();
			}

			private void createInternetDialog() {
	mInternetDialog = new InternetDialog(mContext, mock(InternetDialogFactory.class),		mInternetDialog = new InternetDialog(mContext, mock(InternetDialogFactory.class),
	mInternetDialogController, true, true, true, mock(UiEventLogger.class), mHandler,		mInternetDialogController, true, true, true, mock(UiEventLogger.class), mHandler,
	mBgExecutor, mKeyguard);		mBgExecutor, mKeyguard);
	@@ -114,6 +131,8 @@ public class InternetDialogTest extends SysuiTestCase {
	mEthernet = mDialogView.requireViewById(R.id.ethernet_layout);		mEthernet = mDialogView.requireViewById(R.id.ethernet_layout);
	mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_network_layout);		mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_network_layout);
	mWifiToggle = mDialogView.requireViewById(R.id.turn_on_wifi_layout);		mWifiToggle = mDialogView.requireViewById(R.id.turn_on_wifi_layout);
			mWifiToggleSwitch = mDialogView.requireViewById(R.id.wifi_toggle);
			mWifiToggleSummary = mDialogView.requireViewById(R.id.wifi_toggle_summary);
	mConnectedWifi = mDialogView.requireViewById(R.id.wifi_connected_layout);		mConnectedWifi = mDialogView.requireViewById(R.id.wifi_connected_layout);
	mWifiList = mDialogView.requireViewById(R.id.wifi_list_layout);		mWifiList = mDialogView.requireViewById(R.id.wifi_list_layout);
	mSeeAll = mDialogView.requireViewById(R.id.see_all_layout);		mSeeAll = mDialogView.requireViewById(R.id.see_all_layout);
	@@ -124,6 +143,7 @@ public class InternetDialogTest extends SysuiTestCase {
	@After		@After
	public void tearDown() {		public void tearDown() {
	mInternetDialog.dismissDialog();		mInternetDialog.dismissDialog();
			mMockitoSession.finishMocking();
	}		}

	@Test		@Test
	@@ -410,6 +430,33 @@ public class InternetDialogTest extends SysuiTestCase {
	assertThat(mSeeAll.getVisibility()).isEqualTo(View.GONE);		assertThat(mSeeAll.getVisibility()).isEqualTo(View.GONE);
	}		}

			@Test
			public void updateDialog_disallowChangeWifiState_disableWifiSwitch() {
			mInternetDialog.dismissDialog();
			when(WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(mContext)).thenReturn(false);
			createInternetDialog();

			mInternetDialog.updateDialog(false);

			// Disable Wi-Fi switch and show restriction message in summary.
			assertThat(mWifiToggleSwitch.isEnabled()).isFalse();
			assertThat(mWifiToggleSummary.getVisibility()).isEqualTo(View.VISIBLE);
			assertThat(mWifiToggleSummary.getText().length()).isNotEqualTo(0);
			}

			@Test
			public void updateDialog_allowChangeWifiState_enableWifiSwitch() {
			mInternetDialog.dismissDialog();
			when(WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(mContext)).thenReturn(true);
			createInternetDialog();

			mInternetDialog.updateDialog(false);

			// Enable Wi-Fi switch and hide restriction message in summary.
			assertThat(mWifiToggleSwitch.isEnabled()).isTrue();
			assertThat(mWifiToggleSummary.getVisibility()).isEqualTo(View.GONE);
			}

	@Test		@Test
	public void updateDialog_wifiOn_hideWifiScanNotify() {		public void updateDialog_wifiOn_hideWifiScanNotify() {
	// The preconditions WiFi ON and WiFi entries are already in setUp()		// The preconditions WiFi ON and WiFi entries are already in setUp()