Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bad1d41 authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in dump and add additional dump data" am: 36478cfd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682045

Change-Id: I0542725ae7f4402c1940848b299ee6eac945bae6
parents 0c8d65b4 36478cfd

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

+8 −0
Original line number Diff line number Diff line
@@ -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

+10 −2
Original line number Diff line number Diff line
@@ -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();

        if (mUnderlying != null) {

            mUnderlying.dump(pw);

        } else {

            pw.println("null");

        }

        pw.decreaseIndent();

        pw.println();