Merge "Add missing JNI method to MessageQueue_ravenwood" into main (f1d77bb8) · Commits · e / os / android_frameworks_base

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.compat.annotation.UnsupportedAppUsage;
		import android.ravenwood.annotation.RavenwoodKeepWholeClass;
		import android.ravenwood.annotation.RavenwoodRedirect;
		import android.ravenwood.annotation.RavenwoodRedirectionClass;
		import android.ravenwood.annotation.RavenwoodReplace;
		import android.ravenwood.annotation.RavenwoodThrow;
		import android.util.Log;
		import android.util.Printer;
		@@ -146,7 +145,7 @@ public final class MessageQueue {
		private native static boolean nativeIsPolling(long ptr);
		@RavenwoodRedirect
		private native static void nativeSetFileDescriptorEvents(long ptr, int fd, int events);

		@RavenwoodRedirect
		private native static void nativeSetSkipEpollWaitForZeroTimeout(long ptr);

		MessageQueue(boolean quitAllowed) {
		@@ -223,9 +222,7 @@ public final class MessageQueue {
		if (sSkipEpollWaitForZeroTimeoutInitialized) {
		return;
		}
		if (Flags.nativeLooperSkipEpollWaitForZeroTimeout()) {
		nativeSetSkipEpollWaitForZeroTimeout(ptr);
		}
		sSkipEpollWaitForZeroTimeoutInitialized = true;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -97,4 +97,8 @@ class MessageQueue_ravenwood {
		public static void nativeSetFileDescriptorEvents(long ptr, int fd, int events) {
		throw new UnsupportedOperationException();
		}

		public static void nativeSetSkipEpollWaitForZeroTimeout(long ptr) {
		// No-op; this method changes native MQ impl behavior and cannot be mocked here.
		}
		}