Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove TRACE_TAG_APEX_MANAGER" into tm-dev

Browse Source
This commit is contained in:
Nikita Ioffe
2022-03-22 15:53:59 +00:00
committed by Android (Google) Code Review
parent c5230e0d18 e4f87d302e
commit 2da047710d
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/Trace.java
View File

@@ -107,9 +107,6 @@ public final class Trace {
public static final long TRACE_TAG_RRO = 1L << 26; public static final long TRACE_TAG_RRO = 1L << 26;
/** @hide */ /** @hide */
public static final long TRACE_TAG_THERMAL = 1L << 27; 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 long TRACE_TAG_NOT_READY = 1L << 63;
private static final int MAX_SECTION_NAME_LEN = 127; private static final int MAX_SECTION_NAME_LEN = 127;

2
services/core/java/com/android/server/pm/ApexManager.java
View File

@@ -520,7 +520,7 @@ public abstract class ApexManager {
@Override @Override
public List<ActiveApexInfo> getActiveApexInfos() { public List<ActiveApexInfo> getActiveApexInfos() {
final TimingsTraceAndSlog t = new TimingsTraceAndSlog(TAG + "Timing", final TimingsTraceAndSlog t = new TimingsTraceAndSlog(TAG + "Timing",
Trace.TRACE_TAG_APEX_MANAGER); Trace.TRACE_TAG_PACKAGE_MANAGER);
synchronized (mLock) { synchronized (mLock) {
if (mActiveApexInfosCache == null) { if (mActiveApexInfosCache == null) {
t.traceBegin("getActiveApexInfos_noCache"); t.traceBegin("getActiveApexInfos_noCache");