Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f63ab768 authored Dec 02, 2022 by Parth Sane Committed by Automerger Merge Worker Dec 02, 2022

Merge "Add support for AIDL traces for Priv apps" am: 93dae4bc am: 4c17cc17 am: a022ca79

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

Change-Id: I55ca66be4da0baa8baff6887bba541adcffad44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 0e28664e a022ca79

core/api/module-lib-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,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
		}

core/api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -10021,6 +10021,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[]);

core/java/android/os/Trace.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;