diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-10-18 18:51:38 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-10-18 18:51:38 +0800 |
| commit | 136c335a69069bbb07af1a842acc4629c3131139 (patch) | |
| tree | 28b24c500f5f95413542297f0cac214352253ff2 /src | |
| parent | 52c5c76bddbf3994867a00d0e266b390592486aa (diff) | |
| download | LegacyCamera-136c335a69069bbb07af1a842acc4629c3131139.zip LegacyCamera-136c335a69069bbb07af1a842acc4629c3131139.tar.gz LegacyCamera-136c335a69069bbb07af1a842acc4629c3131139.tar.bz2 | |
Fix 5472996: NPE in switchToOtherMode.
Change-Id: Ied128d3cf5e8ee632c46f371aeaa0a42bb2f1cb5
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/Camera.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 8cc5816..a66a764 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -2078,7 +2078,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, private boolean switchToOtherMode(int mode) { if (isFinishing()) return false; - mImageSaver.waitDone(); + if (mImageSaver != null) mImageSaver.waitDone(); MenuHelper.gotoMode(mode, Camera.this); mHandler.removeMessages(FIRST_TIME_INIT); finish(); |