diff options
| author | Owen Lin <owenlin@google.com> | 2012-10-05 18:01:21 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2012-10-05 18:01:21 +0800 |
| commit | e32915d3ad832b7245e64a5df08dedf99474def4 (patch) | |
| tree | 314bfdfffeef1b250a9bd4bc0e39b00f88dfc949 /src | |
| parent | 7e64ee9eb727c20bc306a0bdda5b2009d0a0bfc5 (diff) | |
| download | android_packages_apps_Snap-e32915d3ad832b7245e64a5df08dedf99474def4.tar.gz android_packages_apps_Snap-e32915d3ad832b7245e64a5df08dedf99474def4.tar.bz2 android_packages_apps_Snap-e32915d3ad832b7245e64a5df08dedf99474def4.zip | |
Fix ANR in creating the fallback animation.
bug: 6620501
Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8
Diffstat (limited to 'src')
| -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(); } } |