diff options
| -rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 62ddc39..4440417 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -1559,15 +1559,20 @@ public class RenderScript { mMessageThread.mRun = false; // Wait for mMessageThread to join. Try in a loop, in case this thread gets interrupted - // during the wait. - boolean hasJoined = false; + // during the wait. If interrupted, set the "interrupted" status of the current thread. + boolean hasJoined = false, interrupted = false; while (!hasJoined) { try { mMessageThread.join(); 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(); |