diff options
| author | George Mount <mount@google.com> | 2012-10-02 09:57:30 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2012-10-02 09:57:30 -0700 |
| commit | 2ff430a16266c59549ebac205bead2e72638c53c (patch) | |
| tree | dfbfc0d9c661225bad321319740d5e2c01bb3d88 /src | |
| parent | 9a6a288c152a924cc9f514e41f6fb19326095e07 (diff) | |
| download | Camera-2ff430a16266c59549ebac205bead2e72638c53c.tar.gz | |
Fix Monkey NPE
Bug 7269886
Change-Id: I3ff09868cba897d987327880d65684033a878d4c
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 3a9da076..6a36ac39 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -685,9 +685,11 @@ public class PhotoModule mZoomMax = mParameters.getMaxZoom(); // Currently we use immediate zoom for fast zooming to get better UX and // there is no plan to take advantage of the smooth zoom. - mZoomRenderer.setZoomMax(mZoomMax); - mZoomRenderer.setZoomIndex(mParameters.getZoom()); - mZoomRenderer.setOnZoomChangeListener(new ZoomChangeListener()); + if (mZoomRenderer != null) { + mZoomRenderer.setZoomMax(mZoomMax); + mZoomRenderer.setZoomIndex(mParameters.getZoom()); + mZoomRenderer.setOnZoomChangeListener(new ZoomChangeListener()); + } } @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) |