diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-24 21:26:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-24 21:26:23 -0700 |
| commit | 0b7251baa132e5a8a5ec1795dc20c09bd137658d (patch) | |
| tree | 96fbb8593e3d1e6fe54437adc3e9d53c75ced7d3 | |
| parent | bb1d239944f9c684fb381444f5b694bcf326646a (diff) | |
| parent | a75a70ff29f8b46d27af38e74f07b1adededb947 (diff) | |
| download | android_packages_apps_Snap-0b7251baa132e5a8a5ec1795dc20c09bd137658d.tar.gz android_packages_apps_Snap-0b7251baa132e5a8a5ec1795dc20c09bd137658d.tar.bz2 android_packages_apps_Snap-0b7251baa132e5a8a5ec1795dc20c09bd137658d.zip | |
Merge "SnapdragonCamera:Fix surface NP" into camera-SnapdragonCamera.lnx.2.0
| -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 057b17790..a3466d8e9 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1497,7 +1497,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()); + } } }); } @@ -4180,7 +4184,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()); + } } }); } |