From 04568574c6a24efcf8d15426d133979df557ea2e Mon Sep 17 00:00:00 2001 From: Sai Kumar Sanagavarapu Date: Thu, 7 Jan 2016 21:04:11 +0100 Subject: SnapdragonCamera: Query camcorder profiles before usage 1. Use generic camcorder profile query mechanism instead of hardcoding profile enums in app. 2. Fix NPE during startpreview if mFocusManager is null. Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094 --- src/com/android/camera/VideoModule.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/com/android/camera/VideoModule.java') diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 28c62f360..9c3355cb6 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -854,7 +854,8 @@ public class VideoModule implements CameraModule, String defaultQuality = mActivity.getResources().getString( R.string.pref_video_quality_default); if (!defaultQuality.equals("")) { - if (CamcorderProfile.hasProfile(Integer.parseInt(defaultQuality))) { + if (CamcorderProfile.hasProfile( + CameraSettings.VIDEO_QUALITY_TABLE.get(defaultQuality))) { videoQuality = defaultQuality; } } else { @@ -864,7 +865,7 @@ public class VideoModule implements CameraModule, } mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality).apply(); } - int quality = Integer.valueOf(videoQuality); + int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality); // Set video quality. Intent intent = mActivity.getIntent(); -- cgit v1.2.3