summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index eee1110b1..c431222c5 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2242,7 +2242,7 @@ public class PhotoModule
}
return true;
case KeyEvent.KEYCODE_DPAD_LEFT:
- if ( (mCameraState != PREVIEW_STOPPED) &&
+ if ( (mCameraState != PREVIEW_STOPPED) && (mFocusManager != null) &&
(mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING) &&
(mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING_SNAP_ON_FINISH) ) {
if (mbrightness > MINIMUM_BRIGHTNESS) {
@@ -2260,7 +2260,7 @@ public class PhotoModule
}
break;
case KeyEvent.KEYCODE_DPAD_RIGHT:
- if ( (mCameraState != PREVIEW_STOPPED) &&
+ if ( (mCameraState != PREVIEW_STOPPED) && (mFocusManager != null) &&
(mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING) &&
(mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING_SNAP_ON_FINISH) ) {
if (mbrightness < MAXIMUM_BRIGHTNESS) {