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

Merge "Add support for AIDL traces for Priv apps" am: 93dae4bc8f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2311609

Change-Id: Ie31a74f45c0f9f4c063373cdb610d167eb7920cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Parth Sane
2022-12-02 11:18:43 +00:00
committed by Automerger Merge Worker
parent 8579fa7af4 93dae4bc8f
commit 4c17cc1766
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/module-lib-current.txt
View File

@@ -383,7 +383,6 @@ package android.os {
method public static void traceBegin(long, @NonNull String); method public static void traceBegin(long, @NonNull String);
method public static void traceCounter(long, @NonNull String, int); method public static void traceCounter(long, @NonNull String, int);
method public static void traceEnd(long); 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 field public static final long TRACE_TAG_NETWORK = 2097152L; // 0x200000L
} }

4
core/api/system-current.txt
View File

@@ -9721,6 +9721,10 @@ package android.os {
field public static final int STATUS_WAITING_REBOOT = 5; // 0x5 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 { public class UpdateEngine {
ctor public UpdateEngine(); ctor public UpdateEngine();
method @NonNull @WorkerThread public android.os.UpdateEngine.AllocateSpaceResult allocateSpace(@NonNull String, @NonNull String[]); method @NonNull @WorkerThread public android.os.UpdateEngine.AllocateSpaceResult allocateSpace(@NonNull String, @NonNull String[]);

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

@@ -100,7 +100,7 @@ public final class Trace {
/** @hide */ /** @hide */
public static final long TRACE_TAG_VIBRATOR = 1L << 23; public static final long TRACE_TAG_VIBRATOR = 1L << 23;
/** @hide */ /** @hide */
@SystemApi(client = MODULE_LIBRARIES) @SystemApi
public static final long TRACE_TAG_AIDL = 1L << 24; public static final long TRACE_TAG_AIDL = 1L << 24;
/** @hide */ /** @hide */
public static final long TRACE_TAG_NNAPI = 1L << 25; public static final long TRACE_TAG_NNAPI = 1L << 25;