commit 342019d3fe023f5c42c47114aa852047768e599a
author Android Build Merger (Role) <android-build-merger@google.com> Thu Oct 06 21:44:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 06 21:44:51 2016 +0000
tree ba643bedd3074815a0b8449572ff3e0ee83afce0
parent 11f8c5381a6717222bd61325758fe65e66c5e81f
parent 8f6d2bfe02ced00b9e3aab0b8976e869777974b8

Merge "Wear Preview, auto, tv, versions project metadata. b/31771704 b/31903798 b/31773716 am: fd6846e116 am: a7e9861112 am: 5aab061303 am: ad45b14606" into nyc-mr1-dev-plus-aosp

rs/jni/android_renderscript_RenderScript.cpp

diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index 06c4350..af370ff 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -644,7 +644,7 @@
     in_allocs[2] = (RsAllocation)C;
 
     rsScriptForEachMulti((RsContext)con, (RsScript)id, 0,
-                         in_allocs, sizeof(in_allocs), nullptr,
+                         in_allocs, NELEM(in_allocs), nullptr,
                          &call, sizeof(call), nullptr, 0);
 }