diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-13 08:04:19 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2017-02-13 08:04:19 -0700 |
| commit | 300605904f34f5ec4c567175326eae4edca8a4c0 (patch) | |
| tree | 13e84f1c36411ea48abcbc2156b38fb9cbc17ce0 | |
| parent | b61b7311cbc1f31237e93497feb67235007132fc (diff) | |
| parent | 6cf372c7c4ddb03833300eec846e5e75abf6ba1e (diff) | |
| download | android_packages_apps_Gallery2-300605904f34f5ec4c567175326eae4edca8a4c0.tar.gz android_packages_apps_Gallery2-300605904f34f5ec4c567175326eae4edca8a4c0.tar.bz2 android_packages_apps_Gallery2-300605904f34f5ec4c567175326eae4edca8a4c0.zip | |
Merge 6cf372c7c4ddb03833300eec846e5e75abf6ba1e on remote branch
Change-Id: I457653d36744536aa9c7d9e4b68275a186d43b16
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index dff96bf7a..8ad53df22 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -873,6 +873,9 @@ public abstract class PhotoPage extends ActivityState implements private void updateCurrentPhoto(MediaItem photo) { if (mCurrentPhoto == photo) return; mCurrentPhoto = photo; + if (mPhotoView == null) { + return; + } if (mPhotoView.getFilmMode()) { requestDeferredUpdate(); } else { @@ -967,7 +970,7 @@ public abstract class PhotoPage extends ActivityState implements private void refreshHidingMessage() { mHandler.removeMessages(MSG_HIDE_BARS); if (mPhotoView == null) { - mPhotoView = (PhotoView) mRootPane.getComponent(0); + return; } if (!mIsMenuVisible && !mPhotoView.getFilmMode()) { mHandler.sendEmptyMessageDelayed(MSG_HIDE_BARS, HIDE_BARS_TIMEOUT); |