Skip to content

Commit 812e882

Browse files
committed
Merge branch 'threads_count_problem' of https://github.com/Yazon2006/AndroidPdfViewer into Yazon2006-threads_count_problem
2 parents 963f0e6 + e89dc91 commit 812e882

File tree

1 file changed

+10
-1
lines changed
  • android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer

1 file changed

+10
-1
lines changed

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import android.graphics.drawable.Drawable;
3131
import android.net.Uri;
3232
import android.os.AsyncTask;
33+
import android.os.Build;
3334
import android.os.HandlerThread;
3435
import android.util.AttributeSet;
3536
import android.util.Log;
@@ -154,7 +155,7 @@ enum ScrollDir {
154155
private DecodingAsyncTask decodingAsyncTask;
155156

156157
/** The thread {@link #renderingHandler} will run on */
157-
private final HandlerThread renderingHandlerThread;
158+
private HandlerThread renderingHandlerThread;
158159
/** Handler always waiting in the background and rendering tasks */
159160
RenderingHandler renderingHandler;
160161

@@ -462,6 +463,14 @@ public void computeScroll() {
462463
@Override
463464
protected void onDetachedFromWindow() {
464465
recycle();
466+
if (renderingHandlerThread != null) {
467+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
468+
renderingHandlerThread.quitSafely();
469+
} else {
470+
renderingHandlerThread.quit();
471+
}
472+
renderingHandlerThread = null;
473+
}
465474
super.onDetachedFromWindow();
466475
}
467476

0 commit comments

Comments
 (0)