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

am 9fc6948b: am 514e0801: Merge "Fix crash when updating adapter offsets."

Browse Source 
* commit '9fc6948b61d08016dc7dc7db1a28854da8581ea2':
  Fix crash when updating adapter offsets.
This commit is contained in:
Jason Sams
2015-03-03 00:09:38 +00:00
committed by Android Git Automerger
parent 4de38166c6 9fc6948b61
commit e1bd7f766e
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,7 @@ public class AllocationAdapter extends Allocation {
private void updateOffsets() { private void updateOffsets() {
int a1 = 0, a2 = 0, a3 = 0, a4 = 0; int a1 = 0, a2 = 0, a3 = 0, a4 = 0;
if (mSelectedArray != null) {
if (mSelectedArray.length > 0) { if (mSelectedArray.length > 0) {
a1 = mSelectedArray[0]; a1 = mSelectedArray[0];
} }
@@ -84,6 +85,7 @@ public class AllocationAdapter extends Allocation {
if (mSelectedArray.length > 3) { if (mSelectedArray.length > 3) {
a4 = mSelectedArray[3]; a4 = mSelectedArray[3];
} }
}
mRS.nAllocationAdapterOffset(getID(mRS), mSelectedX, mSelectedY, mSelectedZ, mRS.nAllocationAdapterOffset(getID(mRS), mSelectedX, mSelectedY, mSelectedZ,
mSelectedLOD, mSelectedFace.mID, a1, a2, a3, a4); mSelectedLOD, mSelectedFace.mID, a1, a2, a3, a4);