commit 80fc6a196502aecc06c2feba52561ef24aec77d6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Mar 19 06:07:43 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 19 06:07:43 2024 +0000
tree ff98a84e5e8aef94c097b40ee0556e78c21f5442
parent 73bb247ed453a6d810e8432b89bd3de5d2d1a86f
parent 0b622da3b3f79693b7afeb115a39c36802b501f0

Merge "Add uid state information to trace event" into main am: 0b622da3b3

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

Change-Id: I86180fd25f0e0435174251cdb6b547e3d13d14da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 71ff523..1d35244 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -4322,7 +4322,9 @@
     @GuardedBy("mUidRulesFirstLock")
     private boolean updateUidStateUL(int uid, int procState, long procStateSeq,
             @ProcessCapability int capability) {
-        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateUidStateUL");
+        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateUidStateUL: " + uid + "/"
+                + ActivityManager.procStateToString(procState) + "/" + procStateSeq + "/"
+                + ActivityManager.getCapabilitiesSummary(capability));
         try {
             final UidState oldUidState = mUidState.get(uid);
             if (oldUidState != null && procStateSeq < oldUidState.procStateSeq) {