commit 45034f0663f960d9ee5fb0a101a4732b71f6e2f4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 07 04:20:31 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 07 04:20:31 2025 -0800
tree 6667cba9cf8225451f0822ad94cb21902025dfa3
parent ccb1952fb0839c5d89034da24a9aab14644bfaf5
parent a69cf9bfaa09835e7b3d740b63243a4280cfea0a

Merge cherrypicks of ['googleplex-android-review.googlesource.com/36804013'] into 25Q4-release.

Change-Id: I9baf8a225a0d853b52e9cf96139fd36a1e77f896

core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java

diff --git a/core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java b/core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java
index 0c909cc..c3a1f42 100644
--- a/core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java
+++ b/core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java
@@ -218,7 +218,9 @@
         if (sSkipEpollWaitForZeroTimeoutInitialized) {
             return;
         }
-        nativeSetSkipEpollWaitForZeroTimeout(ptr);
+        if (Flags.nativeLooperSkipEpollWaitForZeroTimeout()) {
+            nativeSetSkipEpollWaitForZeroTimeout(ptr);
+        }
         sSkipEpollWaitForZeroTimeoutInitialized = true;
     }
 

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

diff --git a/core/java/android/os/CombinedMessageQueue/MessageQueue.java b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
index c8d6e86..e22ef2e 100644
--- a/core/java/android/os/CombinedMessageQueue/MessageQueue.java
+++ b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
@@ -214,7 +214,9 @@
         if (sSkipEpollWaitForZeroTimeoutInitialized) {
             return;
         }
-        nativeSetSkipEpollWaitForZeroTimeout(ptr);
+        if (Flags.nativeLooperSkipEpollWaitForZeroTimeout()) {
+            nativeSetSkipEpollWaitForZeroTimeout(ptr);
+        }
         sSkipEpollWaitForZeroTimeoutInitialized = true;
     }