summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-27 08:12:03 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-27 08:12:03 -0700
commit50f42562cffe8a9ab054eda698ccd4419a59e2a0 (patch)
tree0792194dc7b6aab6656d8699b01a842144a627b4
parent1cca56bacef56dfb9c784dd1c9d678226c222cdf (diff)
parent94f1e040db642f718ea89f72ac5e2b91543df295 (diff)
downloadandroid_packages_apps_Gallery2-50f42562cffe8a9ab054eda698ccd4419a59e2a0.tar.gz
android_packages_apps_Gallery2-50f42562cffe8a9ab054eda698ccd4419a59e2a0.tar.bz2
android_packages_apps_Gallery2-50f42562cffe8a9ab054eda698ccd4419a59e2a0.zip
Merge "SnapdragonGallery: Fix app force close because mPhotoView is null."
-rwxr-xr-xsrc/com/android/gallery3d/app/PhotoPage.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 008784c91..161d729da 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -933,6 +933,9 @@ public abstract class PhotoPage extends ActivityState implements
private void refreshHidingMessage() {
mHandler.removeMessages(MSG_HIDE_BARS);
+ if (mPhotoView == null) {
+ mPhotoView = (PhotoView) mRootPane.getComponent(0);
+ }
if (!mIsMenuVisible && !mPhotoView.getFilmMode()) {
mHandler.sendEmptyMessageDelayed(MSG_HIDE_BARS, HIDE_BARS_TIMEOUT);
}