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

* commit '0c9fccf1ed07bc957a215f035f2559dcc08069f3': media Utils: remove parse integer logspam
2015-06-03 19:16:55 +00:00
parent 0e89264386 0c9fccf1ed
commit ed8a31cfb8
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);