commit e41611d7ab79a1ba43056ed9afefd6a685f4800a
author Miao Wang <miaowang@google.com> Wed May 11 19:32:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 11 19:32:00 2016 +0000
tree be10ffea21155ca15b260a370eed1ef314ecf708
parent 63e3e038c4ba6e91c508262b705ec7562ec6cd63
parent b02f7b0a0e17ac97184e113ea527145a302f8bbc

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

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

Change-Id: Icc19c3d04f3b33f928ef6f61b4a42471d51736b5

rs/java/android/renderscript/RenderScript.java

diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 3d1370a..017b5d62 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -1616,6 +1616,9 @@
 
             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.