am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev

* commit 'ab62870c7e787323057d3b16a3ff1fd118fb5925':
  MediaFormat: add getInteger with default value convenience method

media/java/android/media/MediaFormat.java

@@ -272,6 +272,20 @@ public final class MediaFormat {
         return ((Integer)mMap.get(name)).intValue();
     }
 
+    /**
+     * Returns the value of an integer key, or the default value if the
+     * key is missing or is for another type value.
+     * @hide
+     */
+    public final int getInteger(String name, int defaultValue) {
+        try {
+            return getInteger(name);
+        }
+        catch (NullPointerException  e) { /* no such field */ }
+        catch (ClassCastException e) { /* field of different type */ }
+        return defaultValue;
+    }
+
     /**
      * Returns the value of a long key.
      */