commit ade3137c22dd91694742145c2d5fe9d6bae17516
author Yang Ni <yangni@google.com> Wed Apr 06 09:34:34 2016 -0700
committer Yang Ni <yangni@google.com> Wed Apr 06 12:15:41 2016 -0700
tree b6e201f129099aba240e6f19c715f08aa6776eed
parent 49f4e2b958790d692fe54700b00ecdc3e2264085

Avoid accessing TLS in rsClearObject()

Bug: 27874893
Bug: 27925095

rsClearObject() may be called on rsContextDestroy() in the JNI thread,
where TLS is not initialized.

This also reverted Icca50fade1199b6f530f963e9e694366b7d8cf67 that
made rsContextDestroy() go through the FIFO. rsContextDestroy() must
happen off the FIFO, since it joins the FIFO consuming thread.

Both the rsClearObject() change and the rsContextDestroy() revert need
to go together to make RenderScript and Camera CTS tests pass. Hence
this single CL for both changes.

Change-Id: I5f1d91a4cc1ce9bf2b3386fbef6f1171638b5266

rsRuntime.h

diff --git a/rsRuntime.h b/rsRuntime.h
index 7baba08..152db93 100644
--- a/rsRuntime.h
+++ b/rsRuntime.h
@@ -140,7 +140,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 void rsrSetObject(const Context *, rs_object_base *dst, const ObjectBase *src);
-void rsrClearObject(const Context *, rs_object_base *dst);
+void rsrClearObject(rs_object_base *dst);
 
 bool rsrIsObject(const Context *, rs_object_base src);
 bool rsrIsObject(const Context *, ObjectBase* src);