Merge "Support more `os` under Ravenwood." into main (07c778a1) · Commits · e / os / android_frameworks_base

core/java/android/os/Binder.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -396,6 +396,7 @@ public class Binder implements IBinder {
		* This is Test API which will be used to override output of isDirectlyHandlingTransactionNative
		* @hide
		*/
		@android.ravenwood.annotation.RavenwoodKeep
		public static void setIsDirectlyHandlingTransactionOverride(boolean isInTransaction) {
		sIsHandlingBinderTransaction = isInTransaction;
		}
		@@ -1068,6 +1069,7 @@ public class Binder implements IBinder {
		*
		* @hide
		*/
		@android.ravenwood.annotation.RavenwoodKeep
		public @Nullable String getTransactionName(int transactionCode) {
		return null;
		}
		@@ -1076,6 +1078,7 @@ public class Binder implements IBinder {
		* @hide
		*/
		@VisibleForTesting
		@android.ravenwood.annotation.RavenwoodKeep
		public final @Nullable String getTransactionTraceName(int transactionCode) {
		final boolean isInterfaceUserDefined = getMaxTransactionId() == 0;
		if (mTransactionTraceNames == null) {
		@@ -1113,6 +1116,7 @@ public class Binder implements IBinder {
		return transactionTraceName;
		}

		@android.ravenwood.annotation.RavenwoodKeep
		private @NonNull String getSimpleDescriptor() {
		String descriptor = mDescriptor;
		if (descriptor == null) {
		@@ -1132,6 +1136,7 @@ public class Binder implements IBinder {
		* @return The highest user-defined transaction id of all transactions.
		* @hide
		*/
		@android.ravenwood.annotation.RavenwoodKeep
		public int getMaxTransactionId() {
		return 0;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.os;
		import android.compat.annotation.UnsupportedAppUsage;

		/** @hide */
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		public class Broadcaster
		{
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import java.util.function.BinaryOperator;
		*
		* @hide
		*/
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		public class BundleMerger implements Parcelable {
		private static final String TAG = "BundleMerger";

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import java.util.Set;
		*/
		@TestApi
		@Immutable
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		public final class PackageTagsList implements Parcelable {

		// an empty set value matches any attribution tag (ie, wildcard)

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import java.util.Objects;
		* @param <T> the type of the value with an associated timestamp
		* @hide
		*/
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		public final class TimestampedValue<T> implements Parcelable {
		private final long mReferenceTimeMillis;
		@Nullable