diff --git a/src/com/android/settings/vpn/L2tpIpsecEditor.java b/src/com/android/settings/vpn/L2tpIpsecEditor.java index 2bb4c8d9336..51569896656 100644 --- a/src/com/android/settings/vpn/L2tpIpsecEditor.java +++ b/src/com/android/settings/vpn/L2tpIpsecEditor.java @@ -58,8 +58,6 @@ class L2tpIpsecEditor extends SingleServerEditor { String result = super.validate(c); if (result != null) { return result; - } else if (mProfile.isCustomized()) { - return null; } else if (Util.isNullOrEmpty(mUserkey.getValue())) { return c.getString(R.string.vpn_error_userkey_not_selected); } else if (Util.isNullOrEmpty(mUserCertificate.getValue())) { diff --git a/src/com/android/settings/vpn/SingleServerEditor.java b/src/com/android/settings/vpn/SingleServerEditor.java index 63964b44d27..a7848e03e56 100644 --- a/src/com/android/settings/vpn/SingleServerEditor.java +++ b/src/com/android/settings/vpn/SingleServerEditor.java @@ -50,11 +50,9 @@ class SingleServerEditor implements VpnProfileEditor { //@Override public String validate(Context c) { - return (mProfile.isCustomized() - ? null - : (Util.isNullOrEmpty(mServerName.getText()) + return (Util.isNullOrEmpty(mServerName.getText()) ? c.getString(R.string.vpn_error_server_name_empty) - : null)); + : null); } /**