From 67d977098e01e0adf2b35835859430f8232c8720 Mon Sep 17 00:00:00 2001
From: kaiyiz <kaiyiz@codeaurora.org>
Date: Sat, 21 Mar 2015 09:29:23 +0800
Subject: Gallery2: Remove wait when notify dirty

When notify Dirty from photo data adapter, where is a operation of
waiting, but this Object.wait is locked by ReloadTask.

Remove the wait when notify dirty, which notify all right away. And
do the delete operation after last picture's deletion is done.

Change-Id: I3c322c8d01944d1e41d784346da930b907efdb1c
CRs-Fixed: 808799
---
 src/com/android/gallery3d/app/PhotoDataAdapter.java | 6 ------
 src/com/android/gallery3d/ui/PhotoView.java         | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java
index c7dd48b1e..1b6f3def3 100755
--- a/src/com/android/gallery3d/app/PhotoDataAdapter.java
+++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java
@@ -1208,12 +1208,6 @@ public class PhotoDataAdapter implements PhotoPage.Model {
         }
 
         public synchronized void notifyDirty() {
-            while (mDirty) {
-                try {
-                    wait(NOTIFY_DIRTY_WAIT_TIME);
-                } catch (Exception ex) {
-                }
-            }
             mDirty = true;
             notifyAll();
         }
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 5647e36af..c55f84a21 100755
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1133,6 +1133,7 @@ public class PhotoView extends GLView {
         }
 
         private void deleteAfterAnimation(int duration) {
+            if (mHandler.hasMessages(MSG_DELETE_ANIMATION_DONE)) return;
             MediaItem item = mModel.getMediaItem(mTouchBoxIndex);
             if (item == null) return;
             mListener.onCommitDeleteImage();
-- 
cgit v1.2.3