diff options
author | Jason Sams <jsams@google.com> | 2015-03-26 22:53:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-26 22:53:57 +0000 |
commit | 8c0c880bba6ddfc21b541bfa04308531abcd9e0d (patch) | |
tree | ea20f7060af821a8d72109a4486ae2b4bd98710a /rs | |
parent | 94b17bdd99e322eaed174604d23934600cf0380b (diff) | |
parent | b04f9944fb0062541512447a952405ba4b084d30 (diff) | |
download | frameworks_base-8c0c880bba6ddfc21b541bfa04308531abcd9e0d.zip frameworks_base-8c0c880bba6ddfc21b541bfa04308531abcd9e0d.tar.gz frameworks_base-8c0c880bba6ddfc21b541bfa04308531abcd9e0d.tar.bz2 |
am b04f9944: am 22580b83: Merge "Fix potential npe"
* commit 'b04f9944fb0062541512447a952405ba4b084d30':
Fix potential npe
Diffstat (limited to 'rs')
-rw-r--r-- | rs/java/android/renderscript/Mesh.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java index 5b4cadb..13c8e1c 100644 --- a/rs/java/android/renderscript/Mesh.java +++ b/rs/java/android/renderscript/Mesh.java @@ -363,6 +363,9 @@ public class Mesh extends BaseObj { alloc = Allocation.createTyped(mRS, entry.t, mUsage); } else if(entry.e != null) { alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage); + } else { + // Should never happen because the builder will always set one + throw new IllegalStateException("Builder corrupt, no valid element in entry."); } vertexBuffers[ct] = alloc; vtx[ct] = alloc.getID(mRS); @@ -375,6 +378,9 @@ public class Mesh extends BaseObj { alloc = Allocation.createTyped(mRS, entry.t, mUsage); } else if(entry.e != null) { alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage); + } else { + // Should never happen because the builder will always set one + throw new IllegalStateException("Builder corrupt, no valid element in entry."); } long allocID = (alloc == null) ? 0 : alloc.getID(mRS); indexBuffers[ct] = alloc; |