summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShareef Ali <shareefalis@gmail.com>2015-01-18 06:32:18 -0500
committerShareef Ali <shareefalis@gmail.com>2015-01-18 06:36:36 -0500
commit9d7a27113ec466e20a90e2f89e2c392900194ce9 (patch)
treee35577ee393ed09cfbfa308c630df425d5db87ea
parentaa9b875625c4f587124cfceab0249359dc139ca1 (diff)
downloadandroid_packages_apps_Camera2-9d7a27113ec466e20a90e2f89e2c392900194ce9.tar.gz
android_packages_apps_Camera2-9d7a27113ec466e20a90e2f89e2c392900194ce9.tar.bz2
android_packages_apps_Camera2-9d7a27113ec466e20a90e2f89e2c392900194ce9.zip
Camera2: disable 4k snapshot when samsung4k is enabled.
Change-Id: I71c584bb9482a3a90201ea69d84e9e04ec272574
-rw-r--r--src/com/android/camera/VideoModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index bb08242cf..b16a63f8f 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -408,7 +408,7 @@ public class VideoModule extends CameraModule
private void takeASnapshot() {
// Only take snapshots if video snapshot is supported by device
- if(!mCameraCapabilities.supports(CameraCapabilities.Feature.VIDEO_SNAPSHOT)) {
+ if(!mCameraCapabilities.supports(CameraCapabilities.Feature.VIDEO_SNAPSHOT) || isSamsung4k()) {
Log.w(TAG, "Cannot take a video snapshot - not supported by hardware");
return;
}