diff options
| author | shenfe <shenfe@codeaurora.org> | 2016-12-19 15:09:19 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 19:03:25 -0800 |
| commit | 03b47172a6c23b0b0b8d2986e5a93af2d03b9973 (patch) | |
| tree | 38392b80d1a22c4ad343b24d252cfa7d9664cecd | |
| parent | a5813df2fd2348dec07f4db981db85b02daaf56a (diff) | |
| download | android_packages_apps_Gallery2-03b47172a6c23b0b0b8d2986e5a93af2d03b9973.tar.gz android_packages_apps_Gallery2-03b47172a6c23b0b0b8d2986e5a93af2d03b9973.tar.bz2 android_packages_apps_Gallery2-03b47172a6c23b0b0b8d2986e5a93af2d03b9973.zip | |
SnapdragonGallery: Fix mPhotoView null crash.
If mPhotoView is null, return.
Change-Id: I3bd644393b44c1b6571d4eb49ed5a43f2f521048
CRs-Fixed: 1102788
| -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 161d729da..a6576d0e9 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -840,6 +840,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 { @@ -934,7 +937,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); |