diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-17 21:56:54 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-17 21:56:54 -0700 |
commit | c677af58364c893bbee13b7f33451d8af6e2256c (patch) | |
tree | d7acfb45bf3f7044c3e55a6ca647f1ebd6e034a8 | |
parent | d7138a5f820af06fe4644f4a0e0f47cd7b38f141 (diff) | |
parent | 9a0d81972d8a9f68f8724641f2f565df8c851586 (diff) | |
download | android_packages_apps_Snap-c677af58364c893bbee13b7f33451d8af6e2256c.tar.gz android_packages_apps_Snap-c677af58364c893bbee13b7f33451d8af6e2256c.tar.bz2 android_packages_apps_Snap-c677af58364c893bbee13b7f33451d8af6e2256c.zip |
Merge "SnapdragonCamera: Fix the issue that IS is not disabled" into camera.lnx.1.0-dev.1.0
-rw-r--r-- | src/com/android/camera/VideoModule.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 8e2dc90eb..31dd1e92c 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -903,7 +903,8 @@ public class VideoModule implements CameraModule, public boolean is4KEnabled() { if (mProfile.quality == CamcorderProfile.QUALITY_2160P || - mProfile.quality == CamcorderProfile.QUALITY_4KDCI) { + mProfile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_2160P || + mProfile.quality == CamcorderProfile.QUALITY_4KDCI ) { return true; } else { return false; |