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/PhotoModule.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/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 78863230d..d55a16ffb 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2654,7 +2654,8 @@ public class PhotoModule /** This can run on a background thread, so don't do UI updates here. Post any view updates to MainHandler or do it on onPreviewStarted() . */ private void startPreview() { - if (mPaused || mCameraDevice == null || mParameters == null) { + if (mPaused || (mCameraDevice == null) || (null == mFocusManager) || + (mParameters == null)) { return; } |