am b04f9944: am 22580b83: Merge "Fix potential npe" (8c0c880b) · Commits · e / os / android_frameworks_base

rs/java/android/renderscript/Mesh.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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;