From 536fcbd71982b861d580ab3e059f6ace8628335e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 4 Feb 2014 12:09:14 +0100
Subject: [PATCH] Add support for new "native-method" NativeQueryConfig, which
 will be used to implement settings like rotation lock where the
 implementation is on the Java side on Android.

---
 UI/NativeApp.cpp | 17 +++++++++--------
 lang             |  2 +-
 native           |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index dadeeaa47..071bfbe93 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -116,13 +116,10 @@ static UIContext *uiContext;
 
 std::thread *graphicsLoadThread;
 
-class AndroidLogger : public LogListener
-{
+class AndroidLogger : public LogListener {
 public:
-	void Log(LogTypes::LOG_LEVELS level, const char *msg)
-	{
-		switch (level)
-		{
+	void Log(LogTypes::LOG_LEVELS level, const char *msg) {
+		switch (level) {
 		case LogTypes::LVERBOSE:
 		case LogTypes::LDEBUG:
 		case LogTypes::LINFO:
@@ -144,8 +141,7 @@ public:
 
 
 // TODO: Get rid of this junk
-class NativeHost : public Host
-{
+class NativeHost : public Host {
 public:
 	NativeHost() {
 		// hasRendered = false;
@@ -202,6 +198,10 @@ void NativeHost::ShutdownSound() {
 	g_mixer = 0;
 }
 
+std::string NativeQueryConfig(std::string query) {
+	return "";
+}
+
 int NativeMix(short *audio, int num_samples) {
 	if (g_mixer) {
 		num_samples = g_mixer->Mix(audio, num_samples);
@@ -211,6 +211,7 @@ int NativeMix(short *audio, int num_samples) {
 	return num_samples;
 }
 
+// This is called before NativeInit so we do a little bit of initialization here.
 void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, bool *landscape) {
 	*app_nice_name = "PPSSPP";
 	*app_dir_name = "ppsspp";
diff --git a/lang b/lang
index 47b6e7731..4c5d6f0c2 160000
--- a/lang
+++ b/lang
@@ -1 +1 @@
-Subproject commit 47b6e7731030458ae1c9228f5ce41662f499cd7e
+Subproject commit 4c5d6f0c275b6727d779a2b4cb0bdcb4d00b99aa
diff --git a/native b/native
index b0e318f6d..c960fdb0b 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit b0e318f6d11041dec2f5cdec7095f7c57c6d6502
+Subproject commit c960fdb0b2907fdf0f27f6dc02526486b1776dbe