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

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

Merge "CachedAppOptimizer: Correct trace name for COMPACT_NATIVE_MSG" into... 

Merge "CachedAppOptimizer: Correct trace name for COMPACT_NATIVE_MSG" into main am: 54376547 am: 9d3fa278

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



Change-Id: I26210bfe9dd2af2d7b2f7951d60d39376fcb52ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10b88599 9d3fa278

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2122,7 +2122,7 @@ public class CachedAppOptimizer { 
                    Slog.d(TAG_AM,

                    Slog.d(TAG_AM,

                            "Performing native compaction for pid=" + pid

                            "Performing native compaction for pid=" + pid

                                    + " type=" + compactProfile.name());

                                    + " type=" + compactProfile.name());

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "compactSystem");

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "compactNative");

                    try {

                    try {

                        mProcessDependencies.performCompaction(compactProfile, pid);

                        mProcessDependencies.performCompaction(compactProfile, pid);

                    } catch (Exception e) {

                    } catch (Exception e) {