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

This reverts commit ee16d2f705.

@madebr's change was simpler and correct.
This commit is contained in:
Sam Lantinga
2024-05-16 07:52:32 -07:00
parent ee16d2f705
commit 7843579358

View File

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