[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG - Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG Fix: 299931076 Flag: None Test: manual test with TestDPC atest -c SettingsUnitTests:AddNetworkFragmentTest \ SettingsUnitTests:WifiDppConfiguratorActivityTest Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
This commit is contained in:
@@ -16,11 +16,16 @@
|
||||
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.wifi.WifiConfiguration;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserManager;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@@ -41,6 +46,7 @@ import com.android.settings.wifi.dpp.WifiDppUtils;
|
||||
*/
|
||||
public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase2,
|
||||
View.OnClickListener {
|
||||
private static final String TAG = "AddNetworkFragment";
|
||||
|
||||
public static final String WIFI_CONFIG_KEY = "wifi_config_key";
|
||||
@VisibleForTesting
|
||||
@@ -58,6 +64,10 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (!isAddWifiConfigAllowed(getContext())) {
|
||||
getActivity().finish();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -209,4 +219,14 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
|
||||
activity.setResult(Activity.RESULT_CANCELED);
|
||||
activity.finish();
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
static boolean isAddWifiConfigAllowed(Context context) {
|
||||
UserManager userManager = context.getSystemService(UserManager.class);
|
||||
if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) {
|
||||
Log.e(TAG, "The user is not allowed to add Wi-Fi configuration.");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user