Merge "media Utils: remove parse integer logspam" into mnc-dev

2015-06-03 19:07:26 +00:00
parent afa9e99c88 dcb5ab97f6
commit 0c9fccf1ed
1 changed files with 3 additions and 0 deletions
--- a/media/java/android/media/Utils.java
+++ b/media/java/android/media/Utils.java
@@ -209,6 +209,9 @@ class Utils {
    }

    static int parseIntSafely(Object o, int fallback) {
+        if (o == null) {
+            return fallback;
+        }
        try {
            String s = (String)o;
            return Integer.parseInt(s);