From 2d8b5c87d8a424f8c4bb632621d72727b5b3d353 Mon Sep 17 00:00:00 2001
From: Chao Zhang <chaoz@codeaurora.org>
Date: Mon, 25 Jan 2016 14:14:22 +0800
Subject: 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
---
 src/com/android/gallery3d/app/SinglePhotoDataAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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) {
-- 
cgit v1.2.3