diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-12 16:51:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-12 16:51:57 +0000 |
| commit | 6608b57af0fd3b561022b589d4dc7ece567cf759 (patch) | |
| tree | eb882565cd60054967c2692ff24bacea1ee11849 | |
| parent | 14b553530417960d51ac173f09c2fbabf590cd81 (diff) | |
| parent | dc7d1ac9c9fd4ba9f4c689e17a4a248a27463fbe (diff) | |
| download | android_packages_apps_Snap-6608b57af0fd3b561022b589d4dc7ece567cf759.tar.gz android_packages_apps_Snap-6608b57af0fd3b561022b589d4dc7ece567cf759.tar.bz2 android_packages_apps_Snap-6608b57af0fd3b561022b589d4dc7ece567cf759.zip | |
Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/camera/ui/PieRenderer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java index 0d8312ca4..0969e4e63 100644 --- a/src/com/android/camera/ui/PieRenderer.java +++ b/src/com/android/camera/ui/PieRenderer.java @@ -671,7 +671,7 @@ public class PieRenderer extends OverlayRenderer } private void onEnterOpen() { - if ((mCurrentItem != getOpenItem()) && mCurrentItem.hasItems()) { + if ((mCurrentItem != null) && (mCurrentItem != getOpenItem()) && mCurrentItem.hasItems()) { openCurrentItem(); } } |