Merge "Fix code for NPE when click add and cancel repeatly VPN profile" am: 70cae1ce8d am: 2c0ba8b48e

am: 26412bb907

Change-Id: I88f6a19992c80342cd86d1ab031662a6e8824339

src/com/android/settings/vpn2/ConfigDialogFragment.java

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