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 | 3eb2fb4dd2ede7f65ee307061213f0e8860f15f6 (patch) | |
| tree | 99a4303ca7032c0b4169582e1953c567b1aaa808 /gallerycommon/src/com/android | |
| parent | 2fc6641b80a7aedf54062cbd01c40cbf0764a6ca (diff) | |
| parent | 8b9de91b3c01664b24deda202acb5db8594db503 (diff) | |
| download | android_packages_apps_Gallery2-3eb2fb4dd2ede7f65ee307061213f0e8860f15f6.tar.gz android_packages_apps_Gallery2-3eb2fb4dd2ede7f65ee307061213f0e8860f15f6.tar.bz2 android_packages_apps_Gallery2-3eb2fb4dd2ede7f65ee307061213f0e8860f15f6.zip | |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
Diffstat (limited to 'gallerycommon/src/com/android')
| -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 { |