From a75a70ff29f8b46d27af38e74f07b1adededb947 Mon Sep 17 00:00:00 2001 From: jinwu Date: Fri, 21 Sep 2018 18:19:08 +0800 Subject: SnapdragonCamera:Fix surface NP Ensure the surfaceHolder is not null when try to set the size of it. CRs-Fixed: 2288000 Change-Id: Ib8a19329281df54b9464c209002d1cf3fd30bf6e --- src/com/android/camera/CaptureModule.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 7bfee3041..20ef350c0 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1489,7 +1489,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()); + } } }); } @@ -4164,7 +4168,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()); + } } }); } -- cgit v1.2.3