Merge "Fix NPE in dump and add additional dump data"

services/core/java/com/android/server/VcnManagementService.java

@@ -955,6 +955,14 @@ public class VcnManagementService extends IVcnManagementService.Stub {
             pw.decreaseIndent();
             pw.println();
 
+            pw.println("mConfigs:");
+            pw.increaseIndent();
+            for (Entry<ParcelUuid, VcnConfig> entry : mConfigs.entrySet()) {
+                pw.println(entry.getKey() + ": " + entry.getValue().getProvisioningPackageName());
+            }
+            pw.decreaseIndent();
+            pw.println();
+
             pw.println("mVcns:");
             pw.increaseIndent();
             for (Vcn vcn : mVcns.values()) {

services/core/java/com/android/server/vcn/VcnGatewayConnection.java

@@ -2046,7 +2046,11 @@ public class VcnGatewayConnection extends StateMachine {
         pw.println("VcnGatewayConnection (" + mConnectionConfig.getGatewayConnectionName() + "):");
         pw.increaseIndent();
 
-        pw.println("Current state: " + getCurrentState().getClass().getSimpleName());
+        pw.println(
+                "Current state: "
+                        + (getCurrentState() == null
+                                ? null
+                                : getCurrentState().getClass().getSimpleName()));
         pw.println("mIsQuitting: " + mIsQuitting);
         pw.println("mIsInSafeMode: " + mIsInSafeMode);
         pw.println("mCurrentToken: " + mCurrentToken);
@@ -2057,7 +2061,11 @@ public class VcnGatewayConnection extends StateMachine {
 
         pw.println("mUnderlying:");
         pw.increaseIndent();
-        mUnderlying.dump(pw);
+        if (mUnderlying != null) {
+            mUnderlying.dump(pw);
+        } else {
+            pw.println("null");
+        }
         pw.decreaseIndent();
         pw.println();