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

Commit 2ca4a6f3 authored Nov 15, 2022 by Parth Sane Committed by Automerger Merge Worker Nov 15, 2022

Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" am: 60bcab93

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>

parents 121f0b4a 60bcab93

core/api/module-lib-current.txt

+1 −0

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

core/java/android/os/Trace.java

+1 −0

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