commit 67734a08100123e97a38a8e3be283b338f4be08e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sun Jan 19 17:45:46 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Jan 19 17:45:46 2025 -0800
tree 57e5cf0e2ce4346863f264eb096339be6ce89e36
parent 6d76b1a34659a1bebabc8ff6972d156957b3fe1f
parent 4931bd791f9022b97c74eda3f3b89642e5a1eeaa

Merge "Handle POLLERR for RealtimeScheduler" into main

staticlibs/device/com/android/net/module/util/RealtimeScheduler.java

diff --git a/staticlibs/device/com/android/net/module/util/RealtimeScheduler.java b/staticlibs/device/com/android/net/module/util/RealtimeScheduler.java
index a556ccc..c8fdf72 100644
--- a/staticlibs/device/com/android/net/module/util/RealtimeScheduler.java
+++ b/staticlibs/device/com/android/net/module/util/RealtimeScheduler.java
@@ -255,6 +255,10 @@
                     if (!isRunning()) {
                         return 0;
                     }
+                    if ((events & EVENT_ERROR) != 0) {
+                        Log.wtf(TAG, "Got EVENT_ERROR from FileDescriptorEventListener.");
+                        return 0;
+                    }
                     if ((events & EVENT_INPUT) != 0) {
                         handleExpiration();
                     }