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 | ec2cebe4912bbb1a040b0bd52b250528671ef73d (patch) | |
| tree | b52c1538bb172af52a2ad5b67ca0ff914357a50f /src | |
| parent | 3c2fca3fe03888a3db308eea5e69b38479433706 (diff) | |
| parent | 4a40e126df5a77eaf44a52c73011cbfa91879b54 (diff) | |
| download | android_packages_apps_Snap-ec2cebe4912bbb1a040b0bd52b250528671ef73d.tar.gz android_packages_apps_Snap-ec2cebe4912bbb1a040b0bd52b250528671ef73d.tar.bz2 android_packages_apps_Snap-ec2cebe4912bbb1a040b0bd52b250528671ef73d.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) { |