Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."

Browse Source 
* commit '8e30d53b6575a08ec0579fb08c8c4f055598d78b':
  Fix destruction issues relating to AllocationAdapter.
This commit is contained in:
Tim Murray
2014-02-15 00:00:07 +00:00
committed by Android Git Automerger
parent d6739e0f9d 8e30d53b65
commit afb4f8f144
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) {
android.util.Log.e("rs", "create2d " + a);
rs.validate();
AllocationAdapter aa = new AllocationAdapter(0, rs, a);
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
ReentrantReadWriteLock.ReadLock rlock = mRS.mRWLock.readLock();
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);
}
rlock.unlock();