summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-12 08:45:25 -0700
committerMichael Kolb <kolby@google.com>2013-04-12 08:45:25 -0700
commitdc7d1ac9c9fd4ba9f4c689e17a4a248a27463fbe (patch)
treea47b397dfe981ad20d4c1089ce68f5177995440b
parent30ddbfb5277d3f538b12209877fffaffc9b66835 (diff)
downloadandroid_packages_apps_Snap-dc7d1ac9c9fd4ba9f4c689e17a4a248a27463fbe.tar.gz
android_packages_apps_Snap-dc7d1ac9c9fd4ba9f4c689e17a4a248a27463fbe.tar.bz2
android_packages_apps_Snap-dc7d1ac9c9fd4ba9f4c689e17a4a248a27463fbe.zip
Fix NPE in PieRenderer
Bug: 8579025 Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
-rw-r--r--src/com/android/camera/ui/PieRenderer.java2
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();
}
}