summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2019-10-18 23:08:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-10-18 23:08:36 +0000
commit94483f4b539d21075705e8d78b6a48e5cb0c847c (patch)
tree7555d37daf3f8968651c49d5ca99c99b195ef7bd
parent2f03c7dce06dfa87d8193e9fd9022c142f0643a0 (diff)
parent518a32ce92ec1fe47ca41a73581b8794837b422f (diff)
Merge "Add missing atrace tag in OomAdjuster"
-rw-r--r--services/core/java/com/android/server/am/OomAdjuster.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index 6bba7d53b6e9..78a9efc6e2a7 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -345,6 +345,7 @@ public final class OomAdjuster {
Slog.i(TAG_OOM_ADJ, "No oomadj changes for " + app);
}
mService.mOomAdjProfiler.oomAdjEnded();
+ Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
return success;
}