diff options
| author | Miao Wang <miaowang@google.com> | 2016-05-11 19:23:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-11 19:23:54 +0000 |
| commit | b02f7b0a0e17ac97184e113ea527145a302f8bbc (patch) | |
| tree | 9e86f21c5356311b0a2e3f73d33c8552628ba06d /rs/java/android/renderscript/RenderScript.java | |
| parent | 9df8eeb567f7a0eed59f53cc7d23b904972c31f6 (diff) | |
| parent | 9f2a1979a750788f572709fe13c66a917ba8fdf8 (diff) | |
Merge "[RenderScript] Interrupt mMessageThread when tearing down context."
am: 9f2a1979a7
* commit '9f2a1979a750788f572709fe13c66a917ba8fdf8':
[RenderScript] Interrupt mMessageThread when tearing down context.
Change-Id: Ie2b99b85e22b3e871111e33785565f8159939112
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
| -rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 3d1370a52ae3..017b5d62af0f 100644 --- 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. |