commit 50752b732ee0a899433d2ad05d9c524ef2c38634
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 01 21:15:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 01 21:15:43 2017 +0000
tree c60d1e2aebc3248a5b50d27da26b412da99a87cf
parent b79d9f9d49022b1e712956635f7c5e8fa8809866
parent 6a25701bdda59940690971f19ed18e13400af053

Merge "Do not -1 for lshal."

libs/input/Android.bp

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index bd28af1..9485d5b 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -28,9 +28,6 @@
     ],
 
     clang: true,
-    sanitize: {
-        misc_undefined: ["integer"],
-    },
 
     shared_libs: [
         "liblog",
@@ -50,6 +47,10 @@
                 "libutils",
                 "libbinder",
             ],
+
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
         host: {
             shared: {

opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp

diff --git a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp
index f5506ba..026cb37 100644
--- a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp
+++ b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp
@@ -131,6 +131,7 @@
     pointer = _env->CallStaticLongMethod(nioAccessClass,
             getBasePointerID, buffer);
     if (pointer != 0L) {
+        *offset = 0;
         *array = NULL;
         return reinterpret_cast<void *>(pointer);
     }
@@ -138,6 +139,7 @@
     *array = (jarray) _env->CallStaticObjectMethod(nioAccessClass,
             getBaseArrayID, buffer);
     if (*array == NULL) {
+        *offset = 0;
         return (void*) NULL;
     }
     *offset = _env->CallStaticIntMethod(nioAccessClass,