diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-08-22 05:38:32 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-08-22 05:38:32 -0700 |
| commit | d01b7b87bfb11c3f58456e010af5952863e9a61a (patch) | |
| tree | ecc021bb247502e8ed3c11b23a881dda222dc4c1 | |
| parent | 1f426e12d7b34c719e146a7965df8f6e8f682ca7 (diff) | |
| parent | c48e5f8f3946c2187c65a5491a10f676b477e3d6 (diff) | |
| download | android_packages_apps_Snap-d01b7b87bfb11c3f58456e010af5952863e9a61a.tar.gz android_packages_apps_Snap-d01b7b87bfb11c3f58456e010af5952863e9a61a.tar.bz2 android_packages_apps_Snap-d01b7b87bfb11c3f58456e010af5952863e9a61a.zip | |
Merge "SnapdragonCamera: Match video and preview sizes for all HFR modes"
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 2 |
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())) { |