Merge "Remove `use_transaction_codes_for_unknown_methods`" into main (c1b93c04) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/BinderTransactionNameResolver.java

+3 −11

Original line number	Diff line number	Diff line
		@@ -18,9 +18,7 @@ package com.android.internal.os;

		import android.os.Binder;
		import android.text.TextUtils;

		import com.android.internal.annotations.VisibleForTesting;

		import java.lang.reflect.InvocationTargetException;
		import java.lang.reflect.Method;
		import java.lang.reflect.Modifier;
		@@ -38,8 +36,6 @@ import java.util.HashMap;
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		public class BinderTransactionNameResolver {
		private static final Method NO_GET_DEFAULT_TRANSACTION_NAME_METHOD;
		private static final boolean USE_TRANSACTION_CODES_FOR_UNKNOWN_METHODS =
		Flags.useTransactionCodesForUnknownMethods();

		/**
		* Generates the default transaction method name, which is just the transaction code.
		@@ -85,13 +81,9 @@ public class BinderTransactionNameResolver {

		try {
		String methodName = (String) method.invoke(null, transactionCode);
		if (USE_TRANSACTION_CODES_FOR_UNKNOWN_METHODS) {
		return TextUtils.isEmpty(methodName)
		? String.valueOf(transactionCode)
		: methodName;
		} else {
		return methodName;
		}
		} catch (IllegalAccessException \| InvocationTargetException e) {
		throw new RuntimeException(e);
		}

+0 −11

Original line number	Diff line number	Diff line
		@@ -50,17 +50,6 @@ flag {
		bug: "241474956"
		}

		flag {
		name: "use_transaction_codes_for_unknown_methods"
		namespace: "stability"
		description: "Use transaction codes when the method names is unknown"
		bug: "350041302"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "debug_store_enabled"
		namespace: "stability"