Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Safely handle interrupts during Thread.join()"

Browse Source
This commit is contained in:
Pirama Arumuga Nainar
2015-10-05 23:27:10 +00:00
committed by Gerrit Code Review
parent bd57dac5d5 83461d73bc
commit 46b51097b9
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rs/java/android/renderscript/RenderScript.java
View File

@@ -1576,15 +1576,20 @@ public class RenderScript {
mMessageThread.mRun = false; mMessageThread.mRun = false;
// Wait for mMessageThread to join. Try in a loop, in case this thread gets interrupted // Wait for mMessageThread to join. Try in a loop, in case this thread gets interrupted
// during the wait. // during the wait. If interrupted, set the "interrupted" status of the current thread.
boolean hasJoined = false; boolean hasJoined = false, interrupted = false;
while (!hasJoined) { while (!hasJoined) {
try { try {
mMessageThread.join(); mMessageThread.join();
hasJoined = true; hasJoined = true;
} catch (InterruptedException e) { } catch (InterruptedException e) {
interrupted = true;
} }
} }
if (interrupted) {
Log.v(LOG_TAG, "Interrupted during wait for MessageThread to join");
Thread.currentThread().interrupt();
}
nContextDestroy(); nContextDestroy();