Add more policy transparency for wifi settings.
Show policy transparency dialog if user tries to modify a wifi configuration locked by device owner. Bug: 27375948 Change-Id: I504082282f57bc5de9f097e962d195ecd2cc9da4
This commit is contained in:
@@ -24,6 +24,7 @@ import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.wifi.AccessPoint;
|
||||
|
||||
class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterface.OnClickListener {
|
||||
@@ -43,13 +44,11 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterfac
|
||||
private View mView;
|
||||
private WifiConfigController mController;
|
||||
private boolean mHideSubmitButton;
|
||||
private boolean mHideForgetButton;
|
||||
|
||||
public WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
|
||||
int mode, boolean hideSubmitButton, boolean hideForgetButton) {
|
||||
int mode, boolean hideSubmitButton) {
|
||||
this(context, listener, accessPoint, mode);
|
||||
mHideSubmitButton = hideSubmitButton;
|
||||
mHideForgetButton = hideForgetButton;
|
||||
}
|
||||
|
||||
public WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
|
||||
@@ -59,7 +58,6 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterfac
|
||||
mListener = listener;
|
||||
mAccessPoint = accessPoint;
|
||||
mHideSubmitButton = false;
|
||||
mHideForgetButton = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -83,7 +81,7 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterfac
|
||||
mController.enableSubmitIfAppropriate();
|
||||
}
|
||||
|
||||
if (mHideForgetButton) {
|
||||
if (mAccessPoint == null) {
|
||||
mController.hideForgetButton();
|
||||
}
|
||||
}
|
||||
@@ -109,6 +107,12 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterfac
|
||||
mListener.onSubmit(this);
|
||||
break;
|
||||
case BUTTON_FORGET:
|
||||
if (WifiSettings.isEditabilityLockedDown(
|
||||
getContext(), mAccessPoint.getConfig())) {
|
||||
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
|
||||
RestrictedLockUtils.getDeviceOwner(getContext()));
|
||||
return;
|
||||
}
|
||||
mListener.onForget(this);
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user