Add WiFi Enterprise restrictions check for WiFi Configuration Addition
When UserManager.DISALLOW_ADD_WIFI_CONFIG is set to true. - Disable the "Add network" item in the Internet settings. - Activity action API for ACTION_WIFI_ADD_NETWORKS should not be permitted and the user shouldn’t see a prompt for approval Bug: 203169077 Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest Change-Id: I18d7703b5972bfbc12dca10b6432d756813abace
This commit is contained in:
@@ -26,8 +26,10 @@ 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;
|
||||
|
||||
/**
|
||||
* The Preference for users to add Wi-Fi networks in WifiSettings
|
||||
@@ -37,6 +39,8 @@ public class AddWifiNetworkPreference extends Preference {
|
||||
private static final String TAG = "AddWifiNetworkPreference";
|
||||
|
||||
private final Drawable mScanIconDrawable;
|
||||
@VisibleForTesting
|
||||
boolean mIsAddWifiConfigAllow;
|
||||
|
||||
public AddWifiNetworkPreference(Context context) {
|
||||
super(context);
|
||||
@@ -47,6 +51,8 @@ public class AddWifiNetworkPreference extends Preference {
|
||||
setTitle(R.string.wifi_add_network);
|
||||
|
||||
mScanIconDrawable = getDrawable(R.drawable.ic_scan_24dp);
|
||||
mIsAddWifiConfigAllow = WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(context);
|
||||
updatePreferenceForRestriction();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -73,4 +79,12 @@ public class AddWifiNetworkPreference extends Preference {
|
||||
}
|
||||
return buttonIcon;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void updatePreferenceForRestriction() {
|
||||
if (!mIsAddWifiConfigAllow) {
|
||||
setEnabled(false);
|
||||
setSummary(R.string.not_allowed_by_ent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user