Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benedict Wong
2021-04-21 03:04:53 +00:00
committed by Gerrit Code Review
parent 1b7a5e282c a3b8122623
commit 36478cfdaa
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/VcnManagementService.java
View File

@@ -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()) {

12
services/core/java/com/android/server/vcn/VcnGatewayConnection.java
View File

@@ -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();