summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Winterrowd <lenhardw@codeaurora.org>2014-08-21 14:12:04 -0700
committerLeena Winterrowd <lenhardw@codeaurora.org>2014-08-21 16:43:24 -0700
commitc48e5f8f3946c2187c65a5491a10f676b477e3d6 (patch)
treeecc021bb247502e8ed3c11b23a881dda222dc4c1
parent3fab952910c9988e61f6f83f22de5b434ff8bd20 (diff)
downloadandroid_packages_apps_Snap-c48e5f8f3946c2187c65a5491a10f676b477e3d6.tar.gz
android_packages_apps_Snap-c48e5f8f3946c2187c65a5491a10f676b477e3d6.tar.bz2
android_packages_apps_Snap-c48e5f8f3946c2187c65a5491a10f676b477e3d6.zip
SnapdragonCamera: Match video and preview sizes for all HFR modes
HFR sets the video resolution as the preview resolution. Do the same when HSR is selected. CRs-Fixed: 679522, 687765 Change-Id: Ie08ce94193b8f0b53551b00808294eacc66ff6e4
-rwxr-xr-xsrc/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 3c2b3541a..9b68e228a 100755
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -837,7 +837,7 @@ public class VideoModule implements CameraModule,
CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,
mActivity. getString(R.string.pref_camera_hfr_default));
- if(!("off".equals(HighFrameRate)) && !("hsr".equals(HighFrameRate))) {
+ if(!("off".equals(HighFrameRate))) {
Size size = null;
try {
if (isSupported(HighFrameRate.substring(3), mParameters.getSupportedVideoHighFrameRateModes())) {