summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java12
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());
+ }
}
});
}