Merge "[RenderScript] Interrupt mMessageThread when tearing down context." am: 9f2a1979a7 am: b02f7b0a0e

am: e41611d7ab

* commit 'e41611d7ab79a1ba43056ed9afefd6a685f4800a':
  [RenderScript] Interrupt mMessageThread when tearing down context.

Change-Id: I395e19f5f941fe59b1a23aa5fd2cfeee1eb6e41e

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.