diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-19 19:06:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-19 19:06:51 -0700 |
| commit | abf832f6ca6ee210aafa9ec871224c8554f25e8d (patch) | |
| tree | 8921f12301900591ecd6af73f25bc5beabfe223e /src/com/android/gallery3d/app | |
| parent | e7dc0d2a497e1f36ebb6ebf0f1022ecdc44c8263 (diff) | |
| parent | 64c36a97289291ad6bb22bcef434a1ad353e483d (diff) | |
| download | android_packages_apps_Gallery2-abf832f6ca6ee210aafa9ec871224c8554f25e8d.tar.gz android_packages_apps_Gallery2-abf832f6ca6ee210aafa9ec871224c8554f25e8d.tar.bz2 android_packages_apps_Gallery2-abf832f6ca6ee210aafa9ec871224c8554f25e8d.zip | |
Merge "Fix ANR at work's wait() in ThreadPool"
Diffstat (limited to 'src/com/android/gallery3d/app')
| -rwxr-xr-x | src/com/android/gallery3d/app/SinglePhotoDataAdapter.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java b/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java index 0e697def3..0a18a2713 100755 --- a/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java +++ b/src/com/android/gallery3d/app/SinglePhotoDataAdapter.java @@ -172,11 +172,10 @@ public class SinglePhotoDataAdapter extends TileImageViewAdapter @Override public void pause() { Future<?> task = mTask; - task.cancel(); - task.waitDone(); - if (task.get() == null || task.isDone()) { - mTask = null; + if (!task.isDone()) { + task.cancel(); } + mTask = null; if (mBitmapScreenNail != null) { mBitmapScreenNail.recycle(); mBitmapScreenNail = null; |