diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-08-20 17:10:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-20 17:10:18 +0000 |
| commit | 7a4412d19a355e78f472eba2f3a8d90234b69ee9 (patch) | |
| tree | 48d963d2d76b40b861f06d52231996155e6f40db /src | |
| parent | 2f3a8e1c95e1a689086e585a9db2482dc66ea39b (diff) | |
| parent | 1c83a7cfed7057f5d3719bce40bd3f54f8298c52 (diff) | |
| download | android_packages_apps_Gallery2-7a4412d19a355e78f472eba2f3a8d90234b69ee9.tar.gz android_packages_apps_Gallery2-7a4412d19a355e78f472eba2f3a8d90234b69ee9.tar.bz2 android_packages_apps_Gallery2-7a4412d19a355e78f472eba2f3a8d90234b69ee9.zip | |
Merge "Prevent NPE." into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPageBottomControls.java | 3 |
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()); } } |