From 1a382346dffa81623bcf4496fc41b9b83588e90e Mon Sep 17 00:00:00 2001
From: Parth Sane <parthsane@google.com>
Date: Tue, 22 Nov 2022 12:58:06 +0000
Subject: [PATCH] Add support for AIDL traces for Priv apps

Change-Id: I75c39ebdf87f1068a91c68654b4779eeda4995f0
Test: Manual
Bug: 236441443
---
 core/api/module-lib-current.txt | 1 -
 core/api/system-current.txt     | 4 ++++
 core/java/android/os/Trace.java | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 9b556d8219cb5..ed2c8eba0ab23 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -383,7 +383,6 @@ package android.os {
     method public static void traceBegin(long, @NonNull String);
     method public static void traceCounter(long, @NonNull String, int);
     method public static void traceEnd(long);
-    field public static final long TRACE_TAG_AIDL = 16777216L; // 0x1000000L
     field public static final long TRACE_TAG_NETWORK = 2097152L; // 0x200000L
   }
 
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index d5e7892dba6a6..fd25da251e742 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9715,6 +9715,10 @@ package android.os {
     field public static final int STATUS_WAITING_REBOOT = 5; // 0x5
   }
 
+  public final class Trace {
+    field public static final long TRACE_TAG_AIDL = 16777216L; // 0x1000000L
+  }
+
   public class UpdateEngine {
     ctor public UpdateEngine();
     method @NonNull @WorkerThread public android.os.UpdateEngine.AllocateSpaceResult allocateSpace(@NonNull String, @NonNull String[]);
diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java
index 726ef4d2e3115..320b02c2a0b41 100644
--- a/core/java/android/os/Trace.java
+++ b/core/java/android/os/Trace.java
@@ -100,7 +100,7 @@ public final class Trace {
     /** @hide */
     public static final long TRACE_TAG_VIBRATOR = 1L << 23;
     /** @hide */
-    @SystemApi(client = MODULE_LIBRARIES)
+    @SystemApi
     public static final long TRACE_TAG_AIDL = 1L << 24;
     /** @hide */
     public static final long TRACE_TAG_NNAPI = 1L << 25;