summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-04-28 19:37:29 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-04-28 19:37:29 -0700
commitc4f88651707b8b58817d1b16490de5952b20f057 (patch)
tree17144721cadc11068a0c5a4314362cb14f6cfa33
parentf4624cdd99f14a0ed507b2caa7bb503331a9de7c (diff)
parente13aa01a1d06a131762cf4a639954e499281f0e4 (diff)
downloadandroid_packages_apps_Gallery2-c4f88651707b8b58817d1b16490de5952b20f057.tar.gz
android_packages_apps_Gallery2-c4f88651707b8b58817d1b16490de5952b20f057.tar.bz2
android_packages_apps_Gallery2-c4f88651707b8b58817d1b16490de5952b20f057.zip
Merge "Gallery: fix an ANR in slide show" into android_ui.lnx.1.2.c1-dev
-rw-r--r--src/com/android/gallery3d/app/SlideshowDataAdapter.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/SlideshowDataAdapter.java b/src/com/android/gallery3d/app/SlideshowDataAdapter.java
index 7a0fba5fb..50f8ac2e8 100644
--- a/src/com/android/gallery3d/app/SlideshowDataAdapter.java
+++ b/src/com/android/gallery3d/app/SlideshowDataAdapter.java
@@ -189,7 +189,6 @@ public class SlideshowDataAdapter implements SlideshowPage.Model {
}
mSource.removeContentListener(mSourceListener);
mReloadTask.cancel();
- mReloadTask.waitDone();
mReloadTask = null;
}