diff options
| author | Michael Kolb <kolby@google.com> | 2013-03-13 17:50:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-13 17:50:24 +0000 |
| commit | 9bdae6d02381d1efeea91401be1d08d01ac30d7d (patch) | |
| tree | 143cb9b371d87a0f51eac6ef8a075c806a6c3a46 | |
| parent | 0a7dd573732a06879b35cdd07a8c0ee08b62a32e (diff) | |
| parent | 2441ada50f4bfa3a6c59472ebd3b6339778b8b6b (diff) | |
| download | android_packages_apps_Snap-9bdae6d02381d1efeea91401be1d08d01ac30d7d.tar.gz android_packages_apps_Snap-9bdae6d02381d1efeea91401be1d08d01ac30d7d.tar.bz2 android_packages_apps_Snap-9bdae6d02381d1efeea91401be1d08d01ac30d7d.zip | |
Merge "Fix Monkey NPE" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 995996480..18d0d3e86 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -676,7 +676,8 @@ public class PhotoUI implements PieListener, @Override public void clearFocus() { - getFocusIndicator().clear(); + FocusIndicator indicator = getFocusIndicator(); + if (indicator != null) indicator.clear(); } @Override |