diff options
| author | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2016-01-07 21:04:11 +0100 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-01-07 13:26:05 -0800 |
| commit | 04568574c6a24efcf8d15426d133979df557ea2e (patch) | |
| tree | fac66607f4bb030ebaee7a0b7d235b183e92197e /src/com/android/camera/VideoModule.java | |
| parent | 6bf48d33cacbdcc1df5de29c5a07b1cf5bd1a974 (diff) | |
| download | android_packages_apps_Snap-04568574c6a24efcf8d15426d133979df557ea2e.tar.gz android_packages_apps_Snap-04568574c6a24efcf8d15426d133979df557ea2e.tar.bz2 android_packages_apps_Snap-04568574c6a24efcf8d15426d133979df557ea2e.zip | |
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
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 5 |
1 files changed, 3 insertions, 2 deletions
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(); |