Merge "[RenderScript] Interrupt mMessageThread when tearing down context."

2016-05-11 19:13:00 +00:00
parent b64859d899 4a574806e6
commit 9f2a1979a7
1 changed files with 3 additions and 0 deletions
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -1616,6 +1616,9 @@ public class RenderScript {

            nContextDeinitToClient(mContext);
            mMessageThread.mRun = false;
+            // Interrupt mMessageThread so it gets to see immediately that mRun is false
+            // and exit rightaway.
+            mMessageThread.interrupt();

            // Wait for mMessageThread to join.  Try in a loop, in case this thread gets interrupted
            // during the wait.  If interrupted, set the "interrupted" status of the current thread.