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

Commit 80fc6a19 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I86180fd25f0e0435174251cdb6b547e3d13d14da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73bb247e 0b622da3

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

+3 −1
Original line number Diff line number Diff line
@@ -4322,7 +4322,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    @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) {