diff options
author | Pengchong Jin <pengchong@google.com> | 2015-05-13 00:41:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 00:41:34 +0000 |
commit | 49f0d8846a84e23207dd547ab320c5fa0ee4078a (patch) | |
tree | 6be4c4b0b728a3ab34d0802b5553611a4c62f662 /src/com/android/camera/util | |
parent | f51a30f89aeab87a3f163e306aa7a51b886d2920 (diff) | |
parent | 7e39f8b015985fc0e539e14c193286065b5e51d4 (diff) | |
download | android_packages_apps_Camera2-49f0d8846a84e23207dd547ab320c5fa0ee4078a.tar.gz android_packages_apps_Camera2-49f0d8846a84e23207dd547ab320c5fa0ee4078a.tar.bz2 android_packages_apps_Camera2-49f0d8846a84e23207dd547ab320c5fa0ee4078a.zip |
Merge "WAR of the face detection failure" into ub-camera-haleakala
Diffstat (limited to 'src/com/android/camera/util')
-rw-r--r-- | src/com/android/camera/util/ApiHelper.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java index 0ac72f0c0..6aadc6250 100644 --- a/src/com/android/camera/util/ApiHelper.java +++ b/src/com/android/camera/util/ApiHelper.java @@ -107,4 +107,9 @@ public class ApiHelper { public static boolean isLMr1OrHigher() { return Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP; } + + public static boolean isLorLMr1() { + return Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP + || Build.VERSION.SDK_INT == 22; // Lollipop MR1 + } } |