diff options
| author | Jason Sams <jsams@google.com> | 2015-03-03 00:03:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-03 00:03:58 +0000 |
| commit | 9fc6948b61d08016dc7dc7db1a28854da8581ea2 (patch) | |
| tree | fd5a0c489b51635133053346fed7e3b1aa8474bd /rs/java | |
| parent | aef983562a74cfd573bd5a13dd5bf9123fd3b92f (diff) | |
| parent | 514e0801cc95c9827d220104317e1fe45f396b94 (diff) | |
| download | frameworks_base-9fc6948b61d08016dc7dc7db1a28854da8581ea2.zip frameworks_base-9fc6948b61d08016dc7dc7db1a28854da8581ea2.tar.gz frameworks_base-9fc6948b61d08016dc7dc7db1a28854da8581ea2.tar.bz2 | |
am 514e0801: Merge "Fix crash when updating adapter offsets."
* commit '514e0801cc95c9827d220104317e1fe45f396b94':
Fix crash when updating adapter offsets.
Diffstat (limited to 'rs/java')
| -rw-r--r-- | rs/java/android/renderscript/AllocationAdapter.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/rs/java/android/renderscript/AllocationAdapter.java b/rs/java/android/renderscript/AllocationAdapter.java index 9e28f7c..183726f 100644 --- a/rs/java/android/renderscript/AllocationAdapter.java +++ b/rs/java/android/renderscript/AllocationAdapter.java @@ -72,17 +72,19 @@ public class AllocationAdapter extends Allocation { private void updateOffsets() { int a1 = 0, a2 = 0, a3 = 0, a4 = 0; - if (mSelectedArray.length > 0) { - a1 = mSelectedArray[0]; - } - if (mSelectedArray.length > 1) { - a2 = mSelectedArray[2]; - } - if (mSelectedArray.length > 2) { - a3 = mSelectedArray[2]; - } - if (mSelectedArray.length > 3) { - a4 = mSelectedArray[3]; + if (mSelectedArray != null) { + if (mSelectedArray.length > 0) { + a1 = mSelectedArray[0]; + } + if (mSelectedArray.length > 1) { + a2 = mSelectedArray[2]; + } + if (mSelectedArray.length > 2) { + a3 = mSelectedArray[2]; + } + if (mSelectedArray.length > 3) { + a4 = mSelectedArray[3]; + } } mRS.nAllocationAdapterOffset(getID(mRS), mSelectedX, mSelectedY, mSelectedZ, mSelectedLOD, mSelectedFace.mID, a1, a2, a3, a4); |