summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-04-06 17:05:28 -0700
committerSteve Kondik <steve@cyngn.com>2016-07-30 05:03:50 -0700
commit858413dfa74b4e926111a34037a58ee4055e1348 (patch)
treeafdb4158591227b9988d4631829b84f4e3bca839
parent2fc004c8bbbd21a873141d3710adcd5e2a9ad69a (diff)
downloadandroid_packages_apps_Snap-858413dfa74b4e926111a34037a58ee4055e1348.tar.gz
android_packages_apps_Snap-858413dfa74b4e926111a34037a58ee4055e1348.tar.bz2
android_packages_apps_Snap-858413dfa74b4e926111a34037a58ee4055e1348.zip
SnapdragonCamera: Fix the issue that IS is not disabled
IS needs to be disabled when 4K video is captured. However, 4K video checking logic doesn't include the time lapse 4K profile and reports the incorrect state. This causes the video module fails to disable the IS. Change-Id: I15bfb2e9e6022e367a68819a436e3296d085d33b CRs-Fixed: 997368
-rw-r--r--src/com/android/camera/VideoModule.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 7464604d2..456513516 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -951,7 +951,8 @@ public class VideoModule implements CameraModule,
private 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;