Merge "Fix code for NPE when click add and cancel repeatly VPN profile"

am: 70cae1ce8d

Change-Id: Ie18c7977bb0c48ba5f9524130cbe6649f8840153
This commit is contained in:
sj.cha
2019-04-09 11:20:55 -07:00
committed by android-build-merger

View File

@@ -143,6 +143,10 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
@Override @Override
public void onClick(DialogInterface dialogInterface, int button) { public void onClick(DialogInterface dialogInterface, int button) {
ConfigDialog dialog = (ConfigDialog) getDialog(); ConfigDialog dialog = (ConfigDialog) getDialog();
if (dialog == null) {
Log.e(TAG, "ConfigDialog object is null");
return;
}
VpnProfile profile = dialog.getProfile(); VpnProfile profile = dialog.getProfile();
if (button == DialogInterface.BUTTON_POSITIVE) { if (button == DialogInterface.BUTTON_POSITIVE) {