From e4f87d302ef962481706e4092cfcff7c6e31b232 Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Tue, 22 Mar 2022 11:18:21 +0000
Subject: [PATCH] Remove TRACE_TAG_APEX_MANAGER

It's value is equal to the TRACE_TAG_PACKAGE_MANAGER, and it is only
used in the single place in ApexManager.java, while the rest of
ApexManager.java is using a correct TRACE_TAG_PACKAGE_MANAGER tag.

Bug: 191178460
Test: m
Test: presubmit
Change-Id: Icb2d5d0db0a33c73e6d7d28f352e66b3d5782eab
---
 core/java/android/os/Trace.java                           | 3 ---
 services/core/java/com/android/server/pm/ApexManager.java | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java
index 043e688489a4e..a4f6004a288a6 100644
--- a/core/java/android/os/Trace.java
+++ b/core/java/android/os/Trace.java
@@ -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;
diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java
index 76d3d233d49a4..a91c55fb895df 100644
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -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");