summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-02-14 08:30:59 -0800
committerMichael Kolb <kolby@google.com>2013-02-14 08:30:59 -0800
commit4a40e126df5a77eaf44a52c73011cbfa91879b54 (patch)
treefe49a990102dab34ea69120d4b09924e446ac4ac /src
parent0c5bacd7e45c4f08796ce047fbc356e696c4da65 (diff)
downloadandroid_packages_apps_Snap-4a40e126df5a77eaf44a52c73011cbfa91879b54.tar.gz
android_packages_apps_Snap-4a40e126df5a77eaf44a52c73011cbfa91879b54.tar.bz2
android_packages_apps_Snap-4a40e126df5a77eaf44a52c73011cbfa91879b54.zip
Fix inexplicable monkey NPE
Bug: 8049510 Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/FocusOverlayManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 2bec18760..9acf85de9 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -430,6 +430,7 @@ public class FocusOverlayManager {
public String getFocusMode() {
if (mOverrideFocusMode != null) return mOverrideFocusMode;
+ if (mParameters == null) return Parameters.FOCUS_MODE_AUTO;
List<String> supportedFocusModes = mParameters.getSupportedFocusModes();
if (mFocusAreaSupported && mFocusArea != null) {