summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-01-25 09:08:54 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-01-25 09:08:54 -0800
commit77e7777b38408d4761a5cb2dead04cd8d08f67fc (patch)
tree615814528858458767f3fe48f4a63d4dd4c9530c /src
parentab336f27ffa2e0fc1f2de7d1e6c7de14e9969121 (diff)
parent2d8b5c87d8a424f8c4bb632621d72727b5b3d353 (diff)
downloadandroid_packages_apps_Gallery2-77e7777b38408d4761a5cb2dead04cd8d08f67fc.tar.gz
android_packages_apps_Gallery2-77e7777b38408d4761a5cb2dead04cd8d08f67fc.tar.bz2
android_packages_apps_Gallery2-77e7777b38408d4761a5cb2dead04cd8d08f67fc.zip
Merge "Gallery2: fix display abnormal when openning photo in MMS attachment."
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) {