summaryrefslogtreecommitdiffstats
path: root/gallerycommon/src/com/android/gallery3d
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-04-10 18:19:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-10 18:19:57 +0000
commit6734a36f96dd5b4fd158321a4b59de3b2a79554b (patch)
tree4d989c12a47fc2981d56b149c7ecf93602df506b /gallerycommon/src/com/android/gallery3d
parenta0c21c94c35865b0464cae27436f21d50ff1eb31 (diff)
parentac765f6db6e450c4e8e38bea9439e080d9151485 (diff)
downloadandroid_packages_apps_Snap-6734a36f96dd5b4fd158321a4b59de3b2a79554b.tar.gz
android_packages_apps_Snap-6734a36f96dd5b4fd158321a4b59de3b2a79554b.tar.bz2
android_packages_apps_Snap-6734a36f96dd5b4fd158321a4b59de3b2a79554b.zip
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
Diffstat (limited to 'gallerycommon/src/com/android/gallery3d')
-rw-r--r--gallerycommon/src/com/android/gallery3d/common/ApiHelper.java4
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 {