diff options
| author | Michael Kolb <kolby@google.com> | 2013-02-14 21:43:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-14 21:43:00 +0000 |
| commit | 0ada802ba4753b08dea010aad0a35c3237034f7a (patch) | |
| tree | 95ddfb68c265fdd029ba4b282a380dab876c8f02 /src | |
| parent | e0d4962f96a01b0ff403f8149b9e92ae81f58b77 (diff) | |
| parent | 3e34f81c281f1f715e1c75dfd3f666871d741fea (diff) | |
| download | android_packages_apps_Gallery2-0ada802ba4753b08dea010aad0a35c3237034f7a.tar.gz android_packages_apps_Gallery2-0ada802ba4753b08dea010aad0a35c3237034f7a.tar.bz2 android_packages_apps_Gallery2-0ada802ba4753b08dea010aad0a35c3237034f7a.zip | |
Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/FocusOverlayManager.java | 1 |
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) { |