summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-04-17 23:28:41 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-04-17 23:28:41 -0700
commitcbffaf845c73c28a56bed7bbc8042f3fbaa04031 (patch)
tree769d95c1cbd21ec5c82f5f5b28e5bbb1cd4e6603 /src/com
parent18d26cb32c2051ac38de63c9cf79fbee63d048a5 (diff)
parent2787d12dafcd639df848a36e079246ddf0596139 (diff)
downloadandroid_packages_apps_Gallery2-cbffaf845c73c28a56bed7bbc8042f3fbaa04031.tar.gz
android_packages_apps_Gallery2-cbffaf845c73c28a56bed7bbc8042f3fbaa04031.tar.bz2
android_packages_apps_Gallery2-cbffaf845c73c28a56bed7bbc8042f3fbaa04031.zip
Merge "Gallery: fix an ANR in slide show" into android_ui.lnx.1.2-dev
Diffstat (limited to 'src/com')
-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;
}