瀏覽代碼

android: Fix incorrect usage of ALooper_pollOnce

rdb 1 月之前
父節點
當前提交
a40e8f9fb0
共有 2 個文件被更改,包括 6 次插入8 次删除
  1. 3 4
      panda/src/android/android_main.cxx
  2. 3 4
      pandatool/src/deploy-stub/android_main.cxx

+ 3 - 4
panda/src/android/android_main.cxx

@@ -271,10 +271,9 @@ void android_main(struct android_app* app) {
     // We still need to keep an event loop going until Android gives us leave
     // to end the process.
     while (!app->destroyRequested) {
-      int looper_id;
-      struct android_poll_source *source;
-      auto result = ALooper_pollOnce(-1, &looper_id, nullptr, (void **)&source);
-      if (looper_id == LOOPER_ID_MAIN) {
+      struct android_poll_source *source = nullptr;
+      int ident = ALooper_pollOnce(-1, nullptr, nullptr, (void **)&source);
+      if (ident == LOOPER_ID_MAIN) {
         int8_t cmd = android_app_read_cmd(app);
         android_app_pre_exec_cmd(app, cmd);
         android_app_post_exec_cmd(app, cmd);

+ 3 - 4
pandatool/src/deploy-stub/android_main.cxx

@@ -299,10 +299,9 @@ void android_main(struct android_app *app) {
     // We still need to keep an event loop going until Android gives us leave
     // to end the process.
     while (!app->destroyRequested) {
-      int looper_id;
-      struct android_poll_source *source;
-      auto result = ALooper_pollOnce(-1, &looper_id, nullptr, (void **)&source);
-      if (looper_id == LOOPER_ID_MAIN) {
+      struct android_poll_source *source = nullptr;
+      int ident = ALooper_pollOnce(-1, nullptr, nullptr, (void **)&source);
+      if (ident == LOOPER_ID_MAIN) {
         int8_t cmd = android_app_read_cmd(app);
         android_app_pre_exec_cmd(app, cmd);
         android_app_post_exec_cmd(app, cmd);