summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChao Zhang <chaoz@codeaurora.org>2016-01-25 14:14:22 +0800
committerChao Zhang <chaoz@codeaurora.org>2016-01-25 14:19:32 +0800
commit2d8b5c87d8a424f8c4bb632621d72727b5b3d353 (patch)
tree3ade81c47b7c8d05739505cc585e38293a0a3343 /src
parent7e72c64a5bda84182fc03091bc534b36b2cd822a (diff)
downloadandroid_packages_apps_Gallery2-2d8b5c87d8a424f8c4bb632621d72727b5b3d353.tar.gz
android_packages_apps_Gallery2-2d8b5c87d8a424f8c4bb632621d72727b5b3d353.tar.bz2
android_packages_apps_Gallery2-2d8b5c87d8a424f8c4bb632621d72727b5b3d353.zip
Gallery2: fix display abnormal when openning photo in MMS attachment.
Open photo in MMS attachment, then click "Share" button, SinglePhotoDataAdapter.pause() is called, but mTask is not reset to null. Reset mTask to null and ensure to create new mTask instance in SinglePhotoDataAdapter.resume(). Change-Id: I278d22f04e22b8701e9f57da9bd5df8e485a19ad CRs-Fixed: 963887
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/gallery3d/app/SinglePhotoDataAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java b/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java
index 8134756f8..0e697def3 100755
--- a/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java
+++ b/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java
@@ -174,7 +174,7 @@ public class SinglePhotoDataAdapter extends TileImageViewAdapter
Future<?> task = mTask;
task.cancel();
task.waitDone();
- if (task.get() == null) {
+ if (task.get() == null || task.isDone()) {
mTask = null;
}
if (mBitmapScreenNail != null) {