diff options
| author | 2022-12-02 10:42:33 +0000 | |
|---|---|---|
| committer | 2022-12-02 10:42:33 +0000 | |
| commit | 93dae4bc8ff9f08f423ea53e7470550e6e093077 (patch) | |
| tree | 99f34e5ac63c64007369ae7b74b55b4a77e3a7e4 | |
| parent | 9f25e02fa3c911985f934c0ce846d7bcb6b8d068 (diff) | |
| parent | 1a382346dffa81623bcf4496fc41b9b83588e90e (diff) | |
Merge "Add support for AIDL traces for Priv apps"
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 4 | ||||
| -rw-r--r-- | 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 9b556d8219cb..ed2c8eba0ab2 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 86e9610325de..9ff0afee28bf 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9721,6 +9721,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 726ef4d2e311..320b02c2a0b4 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; |