commit 8bf6efba9edc019cc7da1be3d17c5c4d114d5d3e
author Betty Chang <changbetty@google.com> Thu Dec 23 07:58:48 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 23 07:58:48 2021 +0000
tree 53983bf70292d42bfd9f94e30c048946211c9d9f
parent ce1f8fdb084c01b59b62074b73e9102397bcf595
parent efd5d04ab125e0da9ea55ac1f8b25d91cf8ce836

Merge "To disable Wi-Fi tethering when user restriction is set"

src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java

diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index 70b6a45..67f5944 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -36,6 +36,7 @@
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
 
 import java.util.List;
 
@@ -48,6 +49,8 @@
     private final String[] mWifiRegexs;
     private final WifiManager mWifiManager;
     private final Lifecycle mLifecycle;
+    @VisibleForTesting
+    boolean mIsWifiTetheringAllow;
     private int mSoftApState;
     @VisibleForTesting
     Preference mPreference;
@@ -65,6 +68,7 @@
         mTetheringManager = context.getSystemService(TetheringManager.class);
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mWifiRegexs = mTetheringManager.getTetherableWifiRegexs();
+        mIsWifiTetheringAllow = WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(context);
         mLifecycle = lifecycle;
         if (lifecycle != null) {
             lifecycle.addObserver(this);
@@ -89,6 +93,7 @@
             // unavailable
             return;
         }
+        mPreference.setEnabled(mIsWifiTetheringAllow);
     }
 
     @Override

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
index c3014ca..7ce2bf3 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -26,6 +26,8 @@
 import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.UserManager;
 
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceScreen;
@@ -60,6 +62,10 @@
     @Mock
     private WifiManager mWifiManager;
     @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Bundle mBundle;
+    @Mock
     private PreferenceScreen mScreen;
     private SoftApConfiguration mSoftApConfiguration;
 
@@ -79,6 +85,8 @@
         mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application);
         when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mUserManager.getUserRestrictions()).thenReturn(mBundle);
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         mSoftApConfiguration = new SoftApConfiguration.Builder().setSsid(SSID).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(mSoftApConfiguration);
@@ -86,6 +94,7 @@
         when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         mController = new WifiTetherPreferenceController(mContext, mLifecycle,
                 false /* initSoftApManager */);
+        mController.mIsWifiTetheringAllow = true;
         mController.displayPreference(mScreen);
     }
 
@@ -104,6 +113,24 @@
     }
 
     @Test
+    public void displayPreference_wifiTetheringNotAllowed_shouldDisable() {
+        mController.mIsWifiTetheringAllow = false;
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void displayPreference_wifiTetheringAllowed_shouldEnable() {
+        mController.mIsWifiTetheringAllow = true;
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+
+    @Test
     public void testHandleWifiApStateChanged_stateEnabling_showEnablingSummary() {
         mController.handleWifiApStateChanged(WifiManager.WIFI_AP_STATE_ENABLING, 0 /* reason */);