joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Dump IkeSession in VcnGatewayConnection#dump" into main am: ad55dc3177

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

Change-Id: I5e9a3d23ccbbe9a051333d3c1dbbe2104e5fcf92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yan Yan 2024-04-19 21:34:05 +00:00 • committed by Automerger Merge Worker
commit 53ce1943a5
2 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Vcn/service-b/src/com/android/server/vcn/Vcn.java
View file

@ -626,8 +626,12 @@ public class Vcn extends Handler {
* Dumps the state of this Vcn for logging and debugging purposes.
*
* <p>PII and credentials MUST NEVER be dumped here.
*
* <p>This method is not thread safe and MUST run on the VCN thread.
*/
public void dump(IndentingPrintWriter pw) {
mVcnContext.ensureRunningOnLooperThread();
pw.println("Vcn (" + mSubscriptionGroup + "):");
pw.increaseIndent();

22
Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java
View file

@ -2580,8 +2580,12 @@ public class VcnGatewayConnection extends StateMachine {
* Dumps the state of this VcnGatewayConnection for logging and debugging purposes.
*
* <p>PII and credentials MUST NEVER be dumped here.
*
* <p>This method is not thread safe and MUST run on the VCN thread.
*/
public void dump(IndentingPrintWriter pw) {
mVcnContext.ensureRunningOnLooperThread();
pw.println("VcnGatewayConnection (" + mConnectionConfig.getGatewayConnectionName() + "):");
pw.increaseIndent();
@ -2602,6 +2606,19 @@ public class VcnGatewayConnection extends StateMachine {
mUnderlyingNetworkController.dump(pw);
pw.println();
if (mIkeSession == null) {
pw.println("mIkeSession: null");
} else {
pw.println("mIkeSession:");
// Add a try catch block in case IkeSession#dump is not thread-safe
try {
mIkeSession.dump(pw);
} catch (Exception e) {
Slog.wtf(TAG, "Failed to dump IkeSession: " + e);
}
}
pw.decreaseIndent();
}
@ -2905,6 +2922,11 @@ public class VcnGatewayConnection extends StateMachine {
public void setNetwork(@NonNull Network network) {
mImpl.setNetwork(network);
}
/** Dumps the state of the IkeSession */
public void dump(@NonNull IndentingPrintWriter pw) {
mImpl.dump(pw);
}
}
/** Proxy Implementation of WakeLock, used for testing. */