From 7aa05244383b4ef943a1ec85a71597cd05f27932 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 23 Jul 2026 16:27:59 -0700 Subject: [PATCH 1/2] Update Android test framework polling --- .../sample_framework/src/android/android_app_framework.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/sample_framework/src/android/android_app_framework.cc b/testing/sample_framework/src/android/android_app_framework.cc index 3da216d718..02afc5525e 100644 --- a/testing/sample_framework/src/android/android_app_framework.cc +++ b/testing/sample_framework/src/android/android_app_framework.cc @@ -56,13 +56,13 @@ bool ProcessEvents(int msec) { do { struct android_poll_source* source = nullptr; int events; - looperId = ALooper_pollAll(msec, nullptr, &events, - reinterpret_cast(&source)); + looperId = ALooper_pollOnce(msec, nullptr, &events, + reinterpret_cast(&source)); if (looperId >= 0 && source) { source->process(g_app_state, source); } - } while (looperId != ALOOPER_POLL_TIMEOUT && !g_destroy_requested && - !g_restarted); + msec = 0; + } while (looperId >= 0 && !g_destroy_requested && !g_restarted); return g_destroy_requested | g_restarted; } From d43f36e77d77e7f94972a0bebd41d287235400c0 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 23 Jul 2026 16:36:10 -0700 Subject: [PATCH 2/2] Update android_app_framework.cc --- testing/sample_framework/src/android/android_app_framework.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/sample_framework/src/android/android_app_framework.cc b/testing/sample_framework/src/android/android_app_framework.cc index 02afc5525e..c33fd63a38 100644 --- a/testing/sample_framework/src/android/android_app_framework.cc +++ b/testing/sample_framework/src/android/android_app_framework.cc @@ -62,7 +62,8 @@ bool ProcessEvents(int msec) { source->process(g_app_state, source); } msec = 0; - } while (looperId >= 0 && !g_destroy_requested && !g_restarted); + } while ((looperId >= 0 || looperId == ALOOPER_POLL_CALLBACK) && + !g_destroy_requested && !g_restarted); return g_destroy_requested | g_restarted; }