diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-31 14:48:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-31 14:48:21 -0700 |
| commit | e9b470ca5152478431cae427b163f25acbae7169 (patch) | |
| tree | 8efe91ab7c567904400e2697d982112d45ed7136 | |
| parent | aeedbd92682ec0cb6a92443aa62e4ecfc4e58940 (diff) | |
| parent | 995662a1827fc5e5736e7ea18681f4016659da69 (diff) | |
| download | android_packages_apps_Snap-e9b470ca5152478431cae427b163f25acbae7169.tar.gz android_packages_apps_Snap-e9b470ca5152478431cae427b163f25acbae7169.tar.bz2 android_packages_apps_Snap-e9b470ca5152478431cae427b163f25acbae7169.zip | |
Merge "SnapdragonCamera:Fix surface NP"
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 47cac5e18..a70fe69ba 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1487,7 +1487,11 @@ public class CaptureModule implements CameraModule, PhotoController, if(mFrameProcessor.isFrameFilterEnabled() && !mDeepPortraitMode) { mActivity.runOnUiThread(new Runnable() { public void run() { - mUI.getSurfaceHolder().setFixedSize(mPreviewSize.getHeight(), mPreviewSize.getWidth()); + SurfaceHolder surfaceHolder = mUI.getSurfaceHolder(); + if (surfaceHolder != null) { + surfaceHolder.setFixedSize( + mPreviewSize.getHeight(), mPreviewSize.getWidth()); + } } }); } @@ -4138,7 +4142,11 @@ public class CaptureModule implements CameraModule, PhotoController, if (mFrameProcessor.isFrameFilterEnabled()) { mActivity.runOnUiThread(new Runnable() { public void run() { - mUI.getSurfaceHolder().setFixedSize(mVideoSize.getHeight(), mVideoSize.getWidth()); + SurfaceHolder surfaceHolder = mUI.getSurfaceHolder(); + if (surfaceHolder != null) { + surfaceHolder.setFixedSize( + mVideoSize.getHeight(), mVideoSize.getWidth()); + } } }); } |