From be77ffd4e8f7e9ffa1aba25fbb2ce4511507bc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 26 May 2017 12:29:27 +0200 Subject: [PATCH] Show the Android "board name" in system information. --- UI/DevScreens.cpp | 3 +++ android/jni/app-android.cpp | 5 ++++- ext/native/base/NativeApp.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 868aa500a7..97ba302c67 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -359,6 +359,9 @@ void SystemInfoScreen::CreateViews() { deviceSpecs->Add(new ItemHeader("System Information")); deviceSpecs->Add(new InfoItem("Name", System_GetProperty(SYSPROP_NAME))); deviceSpecs->Add(new InfoItem("Lang/Region", System_GetProperty(SYSPROP_LANGREGION))); + std::string board = System_GetProperty(SYSPROP_BOARDNAME); + if (!board.empty()) + deviceSpecs->Add(new InfoItem("Board", board)); deviceSpecs->Add(new InfoItem("ABI", GetCompilerABI())); #ifdef _WIN32 if (IsDebuggerPresent()) { diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 8deb0e5014..10059b299e 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -330,6 +330,7 @@ static std::queue frameCommands; std::string systemName; std::string langRegion; std::string mogaVersion; +std::string boardName; static float left_joystick_x_async; static float left_joystick_y_async; @@ -419,6 +420,8 @@ std::string System_GetProperty(SystemProperty prop) { return langRegion; case SYSPROP_MOGA_VERSION: return mogaVersion; + case SYSPROP_BOARDNAME: + return boardName; default: return ""; } @@ -548,7 +551,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init std::string shortcut_param = GetJavaString(env, jshortcutParam); std::string cacheDir = GetJavaString(env, jcacheDir); std::string buildBoard = GetJavaString(env, jboard); - + boardName = buildBoard; ILOG("NativeApp.init(): External storage path: %s", externalDir.c_str()); ILOG("NativeApp.init(): Launch shortcut parameter: %s", shortcut_param.c_str()); diff --git a/ext/native/base/NativeApp.h b/ext/native/base/NativeApp.h index 86994b19de..f253662d02 100644 --- a/ext/native/base/NativeApp.h +++ b/ext/native/base/NativeApp.h @@ -155,6 +155,7 @@ enum SystemProperty { SYSPROP_NAME, SYSPROP_LANGREGION, SYSPROP_CPUINFO, + SYSPROP_BOARDNAME, SYSPROP_CLIPBOARD_TEXT, SYSPROP_GPUDRIVER_VERSION,