Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acbace5f authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

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

* commit 'e1bd7f76':
  Fix crash when updating adapter offsets.
parents 0b3d0443 e1bd7f76

rs/java/android/renderscript/AllocationAdapter.java

+13 −11
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class AllocationAdapter extends Allocation { 
    private void updateOffsets() {

        int a1 = 0, a2 = 0, a3 = 0, a4 = 0;



        if (mSelectedArray != null) {

            if (mSelectedArray.length > 0) {

                a1 = mSelectedArray[0];

            }
@@ -84,6 +85,7 @@ public class AllocationAdapter extends Allocation { 
            if (mSelectedArray.length > 3) {

                a4 = mSelectedArray[3];

            }

        }

        mRS.nAllocationAdapterOffset(getID(mRS), mSelectedX, mSelectedY, mSelectedZ,

                                     mSelectedLOD, mSelectedFace.mID, a1, a2, a3, a4);