diff options
| author | ztenghui <ztenghui@google.com> | 2013-04-10 18:19:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-10 18:19:57 +0000 |
| commit | 94bd4b0e6bd1b41f16ea37cc94c80e064f1de14a (patch) | |
| tree | 650891e28499466a99d6a424732ac87cc3da4b5f /gallerycommon/src/com | |
| parent | 3aebab17d67d7acbf8da17d69a0e51f9cd428c35 (diff) | |
| parent | dca875bd0bc713c809e319ddb0adc3bab2d080a6 (diff) | |
| download | android_packages_apps_Snap-94bd4b0e6bd1b41f16ea37cc94c80e064f1de14a.tar.gz android_packages_apps_Snap-94bd4b0e6bd1b41f16ea37cc94c80e064f1de14a.tar.bz2 android_packages_apps_Snap-94bd4b0e6bd1b41f16ea37cc94c80e064f1de14a.zip | |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
Diffstat (limited to 'gallerycommon/src/com')
| -rw-r--r-- | gallerycommon/src/com/android/gallery3d/common/ApiHelper.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java index b0b1fe070..864e1305f 100644 --- a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java +++ b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java @@ -37,6 +37,7 @@ public class ApiHelper { public static final int ICE_CREAM_SANDWICH_MR1 = 15; public static final int JELLY_BEAN = 16; public static final int JELLY_BEAN_MR1 = 17; + public static final int JELLY_BEAN_MR2 = 18; } public static final boolean AT_LEAST_16 = Build.VERSION.SDK_INT >= 16; @@ -188,6 +189,9 @@ public class ApiHelper { public static final boolean HAS_CANCELLATION_SIGNAL = Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN; + public static final boolean HAS_MEDIA_MUXER = + Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR2; + public static int getIntFieldIfExists(Class<?> klass, String fieldName, Class<?> obj, int defaultVal) { try { |