diff options
| author | 2022-11-15 13:27:51 +0000 | |
|---|---|---|
| committer | 2022-11-15 13:27:51 +0000 | |
| commit | 2ca4a6f36afaebda9f4ca320bcce7974307ee442 (patch) | |
| tree | 1662a8089ff95b6dc03fb86540ee9844b6af944f | |
| parent | 121f0b4a9c5fca284ace440b9c851bde898a5324 (diff) | |
| parent | 60bcab93678eec400bbdaa53f1b7f3e3d9119165 (diff) | |
Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" am: 60bcab9367
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2297837
Change-Id: Ic57f33eaadd7a7a197cfabb44a7d362a77c71694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/Trace.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index ed2c8eba0ab2..9b556d8219cb 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -383,6 +383,7 @@ 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/java/android/os/Trace.java b/core/java/android/os/Trace.java index 4965057a7fdb..726ef4d2e311 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -100,6 +100,7 @@ public final class Trace { /** @hide */ public static final long TRACE_TAG_VIBRATOR = 1L << 23; /** @hide */ + @SystemApi(client = MODULE_LIBRARIES) public static final long TRACE_TAG_AIDL = 1L << 24; /** @hide */ public static final long TRACE_TAG_NNAPI = 1L << 25; |