From c9015aa9ba5bd76028f72d1da9a086d52a61765d Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Sun, 5 Feb 2017 14:24:34 -0500
Subject: [PATCH] attempt autoconf fallback for android

---
 intl/msg_hash_chs.h     |  4 ++++
 intl/msg_hash_fr.h      |  4 ++++
 intl/msg_hash_it.h      |  4 ++++
 intl/msg_hash_ja.h      |  4 ++++
 intl/msg_hash_nl.h      |  4 ++++
 intl/msg_hash_ru.h      |  4 ++++
 intl/msg_hash_us.h      |  4 ++++
 msg_hash.h              |  1 +
 tasks/task_autodetect.c | 13 ++++++++++++-
 9 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
index 605e24f2a0..2247b51f46 100644
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@@ -2295,6 +2295,10 @@ MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "未配置"
    )
+MSG_HASH(
+   MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
+   "not configured, using fallback"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
    "数据库 Cursor List"
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
index 0819baaaa7..6456e79004 100644
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@@ -2148,6 +2148,10 @@ MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "not configured"
    )
+MSG_HASH(
+   MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
+   "not configured, using fallback"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
    "Database Cursor List"
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
index bb768530fd..4d3be0310f 100644
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@@ -2170,6 +2170,10 @@ MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "not configured"
    )
+MSG_HASH(
+   MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
+   "not configured, using fallback"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
    "Database Cursor List"
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index f484af982c..01bb610aec 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -2291,6 +2291,10 @@ MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "設定されていない"
    )
+MSG_HASH(
+   MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
+   "not configured, using fallback"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
    "データベースのカーソル表"
diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h
index eaf3eaa27b..6ce92a9aa5 100644
--- a/intl/msg_hash_nl.h
+++ b/intl/msg_hash_nl.h
@@ -2182,6 +2182,10 @@ MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "not configured"
    )
+MSG_HASH(
+   MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
+   "not configured, using fallback"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
    "Database Cursor List"
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index fe85a54dfe..c6beb03f93 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -2181,6 +2181,10 @@ MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "not configured"
    )
+MSG_HASH(
+   MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
+   "not configured, using fallback"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
    "Database Cursor List"
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index a501071b04..0f6acfa3e9 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -2288,6 +2288,10 @@ MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "not configured"
    )
+MSG_HASH(
+   MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
+   "not configured, using fallback"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
    "Database Cursor List"
diff --git a/msg_hash.h b/msg_hash.h
index 510eac16c8..fba5261515 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -168,6 +168,7 @@ enum msg_hash_enums
    MSG_CAPABILITIES,
    MSG_DEVICE_CONFIGURED_IN_PORT,
    MSG_DEVICE_NOT_CONFIGURED,
+   MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
    MSG_DEVICE_DISCONNECTED_FROM_PORT,
    MSG_NO_ARGUMENTS_SUPPLIED_AND_NO_MENU_BUILTIN,
    MSG_COMPILER,
diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 50459adb9b..0021a742ac 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -306,14 +306,25 @@ static void input_autoconfigure_connect_handler(retro_task_t *task)
       char msg[255];
 
       msg[0] = '\0';
-
+#ifndef ANDROID
       RARCH_LOG("Autodetect: no profiles found for %s (%d/%d).\n",
             params->name, params->vid, params->pid);
 
       snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.",
             params->name, (long)params->vid, (long)params->pid,
             msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED));
+#else
+      strlcpy(params->name, "Android Gamepad", sizeof(params->name));
+      if(!input_autoconfigure_joypad_from_conf_internal(params, task))
+      {
+         RARCH_LOG("Autodetect: no profiles found for %s (%d/%d). Using fallback\n",
+               params->name, params->vid, params->pid);
 
+         snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.",
+               params->name, (long)params->vid, (long)params->pid,
+               msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED_FALLBACK));
+      }
+#endif
       task_set_title(task, strdup(msg));
    }