drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix destruction issues relating to AllocationAdapter."

Browse Source
This commit is contained in:
Tim Murray
2014-02-14 23:50:08 +00:00
committed by Gerrit Code Review
parent 509a243c2c 6d63c84f44
commit 7d1a6c5cac
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rs/java/android/renderscript/AllocationAdapter.java
View File

@ -224,7 +224,6 @@ public class AllocationAdapter extends Allocation {
} }
static public AllocationAdapter create2D(RenderScript rs, Allocation a) { static public AllocationAdapter create2D(RenderScript rs, Allocation a) {
android.util.Log.e("rs", "create2d " + a);
rs.validate(); rs.validate();
AllocationAdapter aa = new AllocationAdapter(0, rs, a); AllocationAdapter aa = new AllocationAdapter(0, rs, a);
aa.mConstrainedLOD = true; aa.mConstrainedLOD = true;

3
rs/java/android/renderscript/BaseObj.java
View File

@ -122,7 +122,8 @@ public class BaseObj {
// must include nObjDestroy in the critical section // must include nObjDestroy in the critical section
ReentrantReadWriteLock.ReadLock rlock = mRS.mRWLock.readLock(); ReentrantReadWriteLock.ReadLock rlock = mRS.mRWLock.readLock();
rlock.lock(); rlock.lock();
if(mRS.isAlive()) { // AllocationAdapters are BaseObjs with an ID of 0 but should not be passed to nObjDestroy
if(mRS.isAlive() && mID != 0) {
mRS.nObjDestroy(mID); mRS.nObjDestroy(mID);
} }
rlock.unlock(); rlock.unlock();