[Scummvm-cvs-logs] scummvm master -> 811b1fcc2a2d8e938c2e06489a04388c97715f48

[dhewg]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
507bff8233 ANDROID: Log device manufacturer, model and brand
811b1fcc2a ANDROID: Use the manufacturer string for workarounds


Commit: 507bff8233662019e7b7078b645ce035e796af5b
    https://github.com/scummvm/scummvm/commit/507bff8233662019e7b7078b645ce035e796af5b
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-05T10:06:59-07:00

Commit Message:
ANDROID: Log device manufacturer, model and brand

Changed paths:
    backends/platform/android/android.cpp



diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 6346ffa..eb0e164 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -135,7 +135,10 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) :
 	_trackball_scale(2) {
 	Common::String fp = getSystemProperty("ro.build.fingerprint");
 
-	LOGI("Running on: [%s] [%s] SDK:%s ABI:%s",
+	LOGI("Running on: [%s] [%s] [%s] [%s] [%s] SDK:%s ABI:%s",
+			getSystemProperty("ro.product.manufacturer").c_str(),
+			getSystemProperty("ro.product.model").c_str(),
+			getSystemProperty("ro.product.brand").c_str(),
 			fp.c_str(),
 			getSystemProperty("ro.build.display.id").c_str(),
 			getSystemProperty("ro.build.version.sdk").c_str(),


Commit: 811b1fcc2a2d8e938c2e06489a04388c97715f48
    https://github.com/scummvm/scummvm/commit/811b1fcc2a2d8e938c2e06489a04388c97715f48
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-05T10:10:35-07:00

Commit Message:
ANDROID: Use the manufacturer string for workarounds

Some fingerprints don't contain it, so this should be more reliable.

Changed paths:
    backends/platform/android/android.cpp



diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index eb0e164..ab3f190 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -133,19 +133,19 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) :
 	_touchpad_scale(66),
 	_dpad_scale(4),
 	_trackball_scale(2) {
-	Common::String fp = getSystemProperty("ro.build.fingerprint");
+	Common::String mf = getSystemProperty("ro.product.manufacturer");
 
 	LOGI("Running on: [%s] [%s] [%s] [%s] [%s] SDK:%s ABI:%s",
-			getSystemProperty("ro.product.manufacturer").c_str(),
+			mf.c_str(),
 			getSystemProperty("ro.product.model").c_str(),
 			getSystemProperty("ro.product.brand").c_str(),
-			fp.c_str(),
+			getSystemProperty("ro.build.fingerprint").c_str(),
 			getSystemProperty("ro.build.display.id").c_str(),
 			getSystemProperty("ro.build.version.sdk").c_str(),
 			getSystemProperty("ro.product.cpu.abi").c_str());
 
-	fp.toLowercase();
-	_htc_fail = fp.contains("htc");
+	mf.toLowercase();
+	_htc_fail = mf.contains("htc");
 
 	if (_htc_fail)
 		LOGI("Enabling HTC workaround");