From 2f08c143ec1cecc61e38803da8c79bc9eadcc4b1 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 2 May 2015 00:43:24 +0200
Subject: [PATCH] (Android) Cleanups

---
 frontend/drivers/platform_android.c |  5 +++--
 input/drivers/android_input.c       | 16 ++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c
index 908d206dc3..da01d39eed 100644
--- a/frontend/drivers/platform_android.c
+++ b/frontend/drivers/platform_android.c
@@ -68,7 +68,7 @@ void android_main(struct android_app *android_app)
 {
    char *argv[1];
    int argc = 0;
-   int ret_iterate;
+   int ret_iterate, ret_poll;
 
    g_android          = android_app;
    g_android_userdata = (struct android_app_userdata*)calloc(1, sizeof(*g_android_userdata));
@@ -77,8 +77,9 @@ void android_main(struct android_app *android_app)
       goto end;
 
    do{
+      ret_poll    = 0;
       ret_iterate = rarch_main_iterate();
-   }while(ret_iterate != 1);
+   }while(ret_iterate != -1 && ret_poll != -1);
 
 end:
    main_exit(android_app);
diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index 17e07c925d..d033d02761 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -113,7 +113,7 @@ static void engine_handle_dpad_getaxisvalue(
    state->analog_state[port][9] = (int16_t)(gas * 32767.0f);
 }
 
-static void engine_handle_cmd(void)
+void engine_handle_cmd(void)
 {
    struct android_app *android_app = (struct android_app*)g_android;
    struct android_app_userdata *userdata = (struct android_app_userdata*)g_android_userdata;
@@ -586,7 +586,7 @@ static void android_input_handle_input(android_input_state_t *android)
    }
 }
 
-static void android_input_handle_user(android_input_state_t *state)
+void android_input_handle_user(android_input_state_t *state)
 {
    struct android_app_userdata *userdata = (struct android_app_userdata*)g_android_userdata;
 
@@ -604,15 +604,14 @@ static void android_input_handle_user(android_input_state_t *state)
    }
 }
 
-/* Handle all events. If our activity is in pause state,
- * block until we're unpaused.
- */
-static void android_input_poll(void *data)
+void android_main_poll(void *data)
 {
    int ident;
    android_input_t    *android     = (android_input_t*)data;
    struct android_app_userdata *userdata = (struct android_app_userdata*)g_android_userdata;
 
+   /* Handle all events. If our activity is in pause state,
+    * block until we're unpaused. */
    while ((ident = 
             ALooper_pollAll((input_driver_key_pressed(RARCH_PAUSE_TOGGLE))
                ? -1 : 0,
@@ -635,6 +634,11 @@ static void android_input_poll(void *data)
    memcpy(&android->copy, &userdata->thread_state, sizeof(android->copy));
 }
 
+static void android_input_poll(void *data)
+{
+   android_main_poll(data);
+}
+
 bool android_run_events(void *data)
 {
    global_t *global = global_get_ptr();