Merge "Fix UnusedVariable errorprone issues" into main (cce927d5) · Commits · e / os / android_frameworks_base

errorprone/java/com/google/errorprone/bugpatterns/android/RequiresPermissionChecker.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -130,10 +130,6 @@ public final class RequiresPermissionChecker extends BugChecker
		.onDescendantOf("android.content.Context")
		.withNameMatching(
		Pattern.compile("^send(Ordered\|Sticky)?Broadcast.AsUser.$")));
		private static final Matcher<ExpressionTree> SEND_PENDING_INTENT = methodInvocation(
		instanceMethod()
		.onDescendantOf("android.app.PendingIntent")
		.named("send"));

		private static final Matcher<ExpressionTree> INTENT_SET_ACTION = methodInvocation(
		instanceMethod().onDescendantOf("android.content.Intent").named("setAction"));

+0 −5

Original line number	Diff line number	Diff line
		@@ -37,8 +37,6 @@ public class RavenwoodCommonUtils {
		private RavenwoodCommonUtils() {
		}

		private static final Object sLock = new Object();

		/**
		* If set to "1", we enable the verbose logging.
		*
		@@ -68,9 +66,6 @@ public class RavenwoodCommonUtils {

		public static final String RAVENWOOD_VERSION_JAVA_SYSPROP = "android.ravenwood.version";

		// @GuardedBy("sLock")
		private static boolean sIntegrityChecked = false;

		/**
		* @return if we're running on Ravenwood.
		*/

+3 −8

Original line number	Diff line number	Diff line
		@@ -32,25 +32,20 @@ public class NativeAllocationRegistry {

		public static NativeAllocationRegistry createNonmalloced(
		ClassLoader classLoader, long freeFunction, long size) {
		return new NativeAllocationRegistry(classLoader, freeFunction, size, false);
		return new NativeAllocationRegistry(classLoader, freeFunction, size);
		}

		public static NativeAllocationRegistry createMalloced(
		ClassLoader classLoader, long freeFunction, long size) {
		return new NativeAllocationRegistry(classLoader, freeFunction, size, true);
		return new NativeAllocationRegistry(classLoader, freeFunction, size);
		}

		public static NativeAllocationRegistry createMalloced(
		ClassLoader classLoader, long freeFunction) {
		return new NativeAllocationRegistry(classLoader, freeFunction, 0, true);
		return new NativeAllocationRegistry(classLoader, freeFunction, 0);
		}

		public NativeAllocationRegistry(ClassLoader classLoader, long freeFunction, long size) {
		this(classLoader, freeFunction, size, size == 0);
		}

		private NativeAllocationRegistry(ClassLoader classLoader, long freeFunction, long size,
		boolean mallocAllocation) {
		if (size < 0) {
		throw new IllegalArgumentException("Invalid native allocation size: " + size);
		}