diff options
| author | Michael Kolb <kolby@google.com> | 2013-02-14 08:30:59 -0800 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-02-14 08:30:59 -0800 |
| commit | 3e34f81c281f1f715e1c75dfd3f666871d741fea (patch) | |
| tree | 651463cf09bf561ff3749392f5a3ed48b4f9e1e8 /src | |
| parent | 263eb84489462e5792406710ddb1a9772135b4e9 (diff) | |
| download | android_packages_apps_Gallery2-3e34f81c281f1f715e1c75dfd3f666871d741fea.tar.gz android_packages_apps_Gallery2-3e34f81c281f1f715e1c75dfd3f666871d741fea.tar.bz2 android_packages_apps_Gallery2-3e34f81c281f1f715e1c75dfd3f666871d741fea.zip | |
Fix inexplicable monkey NPE
Bug: 8049510
Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
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) { |