commit 5515801ddea6953e95b2c41a9434bb1fe489e08a
author Owen Lin <owenlin@google.com> Fri Oct 05 18:01:21 2012 +0800
committer Owen Lin <owenlin@google.com> Fri Oct 05 18:01:21 2012 +0800
tree ebab1eaa681e3ce3d1e02a5a737bbd5658aed963
parent e29fc4a51b99f12f7fae13fae272858df2e1af36

Fix ANR in creating the fallback animation.

bug: 6620501
Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8

src/com/android/gallery3d/ui/GLRootView.java

diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java
index 390d587..dbdfb67 100644
--- a/src/com/android/gallery3d/ui/GLRootView.java
+++ b/src/com/android/gallery3d/ui/GLRootView.java
@@ -465,14 +465,15 @@
                 listener = mIdleListeners.removeFirst();
             }
             mRenderLock.lock();
+            boolean keepInQueue;
             try {
-                if (!listener.onGLIdle(mCanvas, mRenderRequested)) return;
+                keepInQueue = listener.onGLIdle(mCanvas, mRenderRequested);
             } finally {
                 mRenderLock.unlock();
             }
             synchronized (mIdleListeners) {
-                mIdleListeners.addLast(listener);
-                if (!mRenderRequested) enable();
+                if (keepInQueue) mIdleListeners.addLast(listener);
+                if (!mRenderRequested && !mIdleListeners.isEmpty()) enable();
             }
         }