summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoPageBottomControls.java
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-08-19 18:52:13 -0700
committerSascha Haeberling <haeberling@google.com>2013-08-19 18:52:13 -0700
commit1c83a7cfed7057f5d3719bce40bd3f54f8298c52 (patch)
tree17f884b59511ace09ea7dbc987b8f727419fff90 /src/com/android/gallery3d/app/PhotoPageBottomControls.java
parentf29cc45abb96754e954d56673e3a959d8bb9787e (diff)
downloadandroid_packages_apps_Gallery2-1c83a7cfed7057f5d3719bce40bd3f54f8298c52.tar.gz
android_packages_apps_Gallery2-1c83a7cfed7057f5d3719bce40bd3f54f8298c52.tar.bz2
android_packages_apps_Gallery2-1c83a7cfed7057f5d3719bce40bd3f54f8298c52.zip
Prevent NPE.
Bug: 10388167 Change-Id: I9293d29e6a1a4f052513409b80fe7d4aaac87529
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPageBottomControls.java')
-rw-r--r--src/com/android/gallery3d/app/PhotoPageBottomControls.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPageBottomControls.java b/src/com/android/gallery3d/app/PhotoPageBottomControls.java
index 24b8ceb7e..57f8b6f35 100644
--- a/src/com/android/gallery3d/app/PhotoPageBottomControls.java
+++ b/src/com/android/gallery3d/app/PhotoPageBottomControls.java
@@ -130,7 +130,8 @@ public class PhotoPageBottomControls implements OnClickListener {
@Override
public void onClick(View view) {
- if (mContainerVisible && mControlsVisible.get(view).booleanValue()) {
+ Boolean controlVisible = mControlsVisible.get(view);
+ if (mContainerVisible && controlVisible != null && controlVisible.booleanValue()) {
mDelegate.onBottomControlClicked(view.getId());
}
}