summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Wailes <chriswailes@google.com> 2020-01-17 11:48:16 -0800
committer android-build-merger <android-build-merger@google.com> 2020-01-17 11:48:16 -0800
commit16d1a78e67aa7299fdf2ec4fcd06fde04c7d67f9 (patch)
tree3bf17b4fc95fa9f0d7b23eee7cf7d4d55e0e8499
parentbbfa310ef219eb25a79bba4802991466aec2c4f5 (diff)
parent7e9f83e18aefe063c2c98e43082b7756dad73fe5 (diff)
Re-adds a trace point that was accidentally removed.
am: 7e9f83e18a Change-Id: I3a194f8adb2e35280e13c36baffaaa0c5f4c5f87
-rw-r--r--core/java/com/android/internal/os/Zygote.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java
index 3c49ac5b8583..fd9f025ce9ba 100644
--- a/core/java/com/android/internal/os/Zygote.java
+++ b/core/java/com/android/internal/os/Zygote.java
@@ -660,6 +660,8 @@ public final class Zygote {
disableExecuteOnly(args.mTargetSdkVersion);
+ Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
+
return ZygoteInit.zygoteInit(args.mTargetSdkVersion,
args.mDisabledCompatChanges,
args.mRemainingArgs,