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

Commit 113fdab2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix conditionally-imbalanced traceEnd" into main

parents 1903b53b 9f85bd9d

services/core/java/com/android/server/am/OomAdjuster.java

+5 −2
Original line number Diff line number Diff line
@@ -498,7 +498,8 @@ public class OomAdjuster { 
                // Skip setting the process group for system_server, keep it as default.

                return true;

            }

            if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {

            final boolean traceEnabled = Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER);

            if (traceEnabled) {

                Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "setProcessGroup "

                        + msg.obj + " to " + group);

            }
@@ -509,8 +510,10 @@ public class OomAdjuster { 
                    Slog.w(TAG, "Failed setting process group of " + pid + " to " + group, e);

                }

            } finally {

                if (traceEnabled) {

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                }

            }

            return true;

        });

        mTmpUidRecords = new ActiveUids(service, false);