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

Commit 028c5131 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Remove TRACE_TAG_APEX_MANAGER" into tm-dev am: 2da04771 

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

Change-Id: I8189190810a021ffb4497efe34235e90dce00562
parents 94725216 2da04771

core/java/android/os/Trace.java

+0 −3
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ public final class Trace { 
    public static final long TRACE_TAG_RRO = 1L << 26;

    /** @hide */

    public static final long TRACE_TAG_THERMAL = 1L << 27;

    /** @hide */



    public static final long TRACE_TAG_APEX_MANAGER = 1L << 18;



    private static final long TRACE_TAG_NOT_READY = 1L << 63;

    private static final int MAX_SECTION_NAME_LEN = 127;

services/core/java/com/android/server/pm/ApexManager.java

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ public abstract class ApexManager { 
        @Override

        public List<ActiveApexInfo> getActiveApexInfos() {

            final TimingsTraceAndSlog t = new TimingsTraceAndSlog(TAG + "Timing",

                    Trace.TRACE_TAG_APEX_MANAGER);

                    Trace.TRACE_TAG_PACKAGE_MANAGER);

            synchronized (mLock) {

                if (mActiveApexInfosCache == null) {

                    t.traceBegin("getActiveApexInfos_noCache");