Minor refactoring in SystemUtils.

nicolasgramlich · Mar 17, 2013 · 2d76371 · 2d76371
1 parent ff7f478
commit 2d76371
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 15 deletions.
diff --git a/src/org/andengine/input/touch/controller/MultiTouch.java b/src/org/andengine/input/touch/controller/MultiTouch.java
@@ -46,15 +46,15 @@ private MultiTouch() {
 
 	public static boolean isSupported(final Context pContext) {
 		if (MultiTouch.sSupported == null) {
-			MultiTouch.sSupported = SystemUtils.hasSystemFeature(pContext, PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH);
+			MultiTouch.sSupported = SystemUtils.hasSystemFeature(pContext, PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH, false);
 		}
 
 		return MultiTouch.sSupported;
 	}
 
 	public static boolean isSupportedDistinct(final Context pContext) {
 		if (MultiTouch.sSupportedDistinct == null) {
-			MultiTouch.sSupportedDistinct = SystemUtils.hasSystemFeature(pContext, PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT);
+			MultiTouch.sSupportedDistinct = SystemUtils.hasSystemFeature(pContext, PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT, false);
 		}
 
 		return MultiTouch.sSupportedDistinct;

diff --git a/src/org/andengine/util/system/SystemUtils.java b/src/org/andengine/util/system/SystemUtils.java
@@ -8,6 +8,7 @@
 
 import org.andengine.util.StreamUtils;
 import org.andengine.util.adt.DataConstants;
+import org.andengine.util.exception.MethodNotFoundException;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -53,6 +54,14 @@ public class SystemUtils {
 	// Getter & Setter
 	// ===========================================================
 
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
 	public static MemoryInfo getMemoryInfo() {
 		/* Lazy allocation. */
 		if (SystemUtils.sMemoryInfo == null) {
@@ -64,18 +73,18 @@ public static MemoryInfo getMemoryInfo() {
 		return SystemUtils.sMemoryInfo;
 	}
 
-	// ===========================================================
-	// Methods for/from SuperClass/Interfaces
-	// ===========================================================
-
-	// ===========================================================
-	// Methods
-	// ===========================================================
-
-	public static boolean isGoogleTV(final Context pContext) {
+	public static boolean isGoogleTV(final Context pContext) throws SystemUtilsException {
 		return SystemUtils.hasSystemFeature(pContext, "com.google.android.tv");
 	}
 
+	public static boolean isGoogleTV(final Context pContext, final boolean pDefault) {
+		try {
+			return SystemUtils.isGoogleTV(pContext);
+		} catch (final SystemUtilsException e) {
+			return pDefault;
+		}
+	}
+
 	public static int getPackageVersionCode(final Context pContext) throws SystemUtilsException {
 		return SystemUtils.getPackageInfo(pContext).versionCode;
 	}
@@ -105,17 +114,30 @@ private static PackageInfo getPackageInfo(final Context pContext) throws SystemU
 		}
 	}
 
-	public static boolean hasSystemFeature(final Context pContext, final String pFeature) {
+	public static boolean hasSystemFeature(final Context pContext, final String pFeature) throws SystemUtilsException {
 		final PackageManager packageManager = pContext.getPackageManager();
 		try {
 			try {
 				return packageManager.hasSystemFeature(pFeature);
 			} catch (final Throwable t) {
-				final Method PackageManager_hasSystemFeatures = PackageManager.class.getMethod("hasSystemFeature", new Class[] { String.class });
-				return (PackageManager_hasSystemFeatures == null) ? false : (Boolean) PackageManager_hasSystemFeatures.invoke(packageManager, pFeature);
+				final Method PackageManager_hasSystemFeatures = PackageManager.class.getMethod("hasSystemFeature", String.class);
+				if (PackageManager_hasSystemFeatures == null) {
+					throw new SystemUtilsException(new MethodNotFoundException(PackageManager.class.getSimpleName() + ".hasSystemFeature(String)"));
+				} else {
+					final boolean result = (Boolean) PackageManager_hasSystemFeatures.invoke(packageManager, pFeature);
+					return result;
+				}
 			}
 		} catch (final Throwable t) {
-			return false;
+			throw new SystemUtilsException(t);
+		}
+	}
+
+	public static boolean hasSystemFeature(final Context pContext, final String pFeature, final boolean pDefault) {
+		try {
+			return SystemUtils.hasSystemFeature(pContext, pFeature);
+		} catch (SystemUtilsException e) {
+			return pDefault;
 		}
 	}