diff --git a/media/java/android/media/Utils.java b/media/java/android/media/Utils.java index 9e01e65031102..2cd3c433407a1 100644 --- 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);