summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2016-05-09 15:40:19 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-07 18:44:50 -0700
commit94386cd469d1cb6248efb9777d709353683dc93f (patch)
tree4e5a07c0c62c4a7ddcfc0523d2cbd0eabf08f0d9 /src/com/android/gallery3d/ui
parent8788884b50a0bdaeac563f5b34f56abe79704fe0 (diff)
downloadandroid_packages_apps_Gallery2-94386cd469d1cb6248efb9777d709353683dc93f.tar.gz
android_packages_apps_Gallery2-94386cd469d1cb6248efb9777d709353683dc93f.tar.bz2
android_packages_apps_Gallery2-94386cd469d1cb6248efb9777d709353683dc93f.zip
Gallery: fix lock/unlock order
Fix lock/unlock order to prevent ANR. Change-Id: I08cee044f9ba10461a276ab2b8af877f821324f4 CRs-Fixed: 1011429
Diffstat (limited to 'src/com/android/gallery3d/ui')
-rw-r--r--src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java b/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
index 74be72255..290657ade 100644
--- a/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
+++ b/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
@@ -69,12 +69,12 @@ public class PreparePageFadeoutTexture implements OnGLIdleListener {
if (task.isCancelled()) return;
GLRoot root = activity.getGLRoot();
RawTexture texture = null;
- root.unlockRenderThread();
+ root.lockRenderThread();
try {
root.addOnGLIdleListener(task);
texture = task.get();
} finally {
- root.lockRenderThread();
+ root.unlockRenderThread();
}
if (texture == null) {