diff options
| author | Owen Lin <owenlin@google.com> | 2012-10-07 20:14:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-07 20:14:48 -0700 |
| commit | 4e82fcb4fecd90087b322f4ad0a40b99d83160ad (patch) | |
| tree | 567a4da1c2c407963e120ad7647d1a1fb95b712e | |
| parent | 86350720d916bd26faadfead5ef91f7f11f8e8e4 (diff) | |
| parent | e32915d3ad832b7245e64a5df08dedf99474def4 (diff) | |
| download | android_packages_apps_Snap-4e82fcb4fecd90087b322f4ad0a40b99d83160ad.tar.gz android_packages_apps_Snap-4e82fcb4fecd90087b322f4ad0a40b99d83160ad.tar.bz2 android_packages_apps_Snap-4e82fcb4fecd90087b322f4ad0a40b99d83160ad.zip | |
Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/ui/GLRootView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java index 390d58737..dbdfb6716 100644 --- a/src/com/android/gallery3d/ui/GLRootView.java +++ b/src/com/android/gallery3d/ui/GLRootView.java @@ -465,14 +465,15 @@ public class GLRootView extends GLSurfaceView 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(); } } |