diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-09-13 13:31:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-09-13 13:31:18 -0700 |
| commit | aa00842f5d4147f4322e390b78a1bc30e244eb56 (patch) | |
| tree | 48ff909792e467e60edab95cb1ba40b88bc44025 /src/com/android | |
| parent | 7c0e9cc3c2f60eced35ad5c475fae22ea27341bf (diff) | |
| parent | 01c8ef29b97d8e6fb23580d0492e9351d98690b4 (diff) | |
| download | android_packages_apps_Snap-aa00842f5d4147f4322e390b78a1bc30e244eb56.tar.gz android_packages_apps_Snap-aa00842f5d4147f4322e390b78a1bc30e244eb56.tar.bz2 android_packages_apps_Snap-aa00842f5d4147f4322e390b78a1bc30e244eb56.zip | |
Merge "Camera: Enable liveshot during 4K recording"
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 30144407c..8223fadf4 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -477,8 +477,7 @@ public class VideoModule implements CameraModule, private void takeASnapshot() { // Only take snapshots if video snapshot is supported by device - if (CameraUtil.isVideoSnapshotSupported(mParameters) && !mIsVideoCaptureIntent - && !is4KEnabled()) { + if (CameraUtil.isVideoSnapshotSupported(mParameters) && !mIsVideoCaptureIntent) { if (!mMediaRecorderRecording || mPaused || mSnapshotInProgress) { return; } |