Browse Source

Revert "Fixed bug #9792 - Android: build failure with ndk 27-beta1 due to use of deprecated ALooper_pollAll"

This reverts commit ee16d2f7052b4e7cdcb9fb0d05d7d76bb7e62fc9.

@madebr's change was simpler and correct.
Sam Lantinga 11 months ago
parent
commit
7843579358
1 changed files with 11 additions and 21 deletions
  1. 11 21
      src/sensor/android/SDL_androidsensor.c

+ 11 - 21
src/sensor/android/SDL_androidsensor.c

@@ -69,30 +69,20 @@ static int SDLCALL SDL_ANDROID_SensorThread(void *data)
 
     while (SDL_AtomicGet(&ctx->running)) {
         Uint64 timestamp = SDL_GetTicksNS();
-        SDL_bool done = SDL_FALSE;
-
-        while (!done) {
-            int result;
-
-            result = ALooper_pollOnce(-1, NULL, &events, (void **)&source);
-            if (result == LOOPER_ID_USER) {
-                SDL_LockSensors();
-                for (i = 0; i < SDL_sensors_count; ++i) {
-                    if (!SDL_sensors[i].event_queue) {
-                        continue;
-                    }
-
-                    SDL_zero(event);
-                    while (ASensorEventQueue_getEvents(SDL_sensors[i].event_queue, &event, 1) > 0) {
-                        SDL_SendSensorUpdate(timestamp, SDL_sensors[i].sensor, timestamp, event.data, SDL_arraysize(event.data));
-                    }
+
+        if (ALooper_pollAll(-1, NULL, &events, (void **)&source) == LOOPER_ID_USER) {
+            SDL_LockSensors();
+            for (i = 0; i < SDL_sensors_count; ++i) {
+                if (!SDL_sensors[i].event_queue) {
+                    continue;
                 }
-                SDL_UnlockSensors();
-            }
 
-            if (result < 0) {
-                done = SDL_TRUE;
+                SDL_zero(event);
+                while (ASensorEventQueue_getEvents(SDL_sensors[i].event_queue, &event, 1) > 0) {
+                    SDL_SendSensorUpdate(timestamp, SDL_sensors[i].sensor, timestamp, event.data, SDL_arraysize(event.data));
+                }
             }
+            SDL_UnlockSensors();
         }
     }