diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-09-10 15:08:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-09-10 15:08:29 -0700 |
| commit | 7836330d3734dbab76a31dfc1de596f7481b7139 (patch) | |
| tree | 724150a35783006fd1e760da1388687d51c58e63 /src | |
| parent | 362f1194e769f30605b95bc78d24f6fd1064683e (diff) | |
| parent | fc500ac739b24518068b0268ab7422dd3aa3b8d5 (diff) | |
| download | android_packages_apps_Snap-7836330d3734dbab76a31dfc1de596f7481b7139.tar.gz android_packages_apps_Snap-7836330d3734dbab76a31dfc1de596f7481b7139.tar.bz2 android_packages_apps_Snap-7836330d3734dbab76a31dfc1de596f7481b7139.zip | |
Merge "SnapdragonCamera: Set default video resolution to 1080p"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index ffbbc0ed4..2bd5e1584 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -784,12 +784,15 @@ public class VideoModule implements CameraModule, mParameters = mCameraDevice.getParameters(); String defaultQuality = mActivity.getResources().getString( R.string.pref_video_quality_default); - if (!defaultQuality.equals("")){ + if (!defaultQuality.equals("") && + CameraUtil.isSupported(defaultQuality, + CameraSettings.getSupportedVideoQualities( + mCameraId, mParameters))){ videoQuality = defaultQuality; } else { - // check for highest quality supported - videoQuality = CameraSettings.getSupportedHighestVideoQuality( - mCameraId, mParameters); + // check for highest quality supported + videoQuality = CameraSettings.getSupportedHighestVideoQuality( + mCameraId, mParameters); } mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality).apply(); } |