commit c240f22bdfde1c3e9b538c2b686d0887a5a16df5
author Orion Hodson <oth@google.com> Tue Feb 26 18:05:03 2019 +0000
committer Orion Hodson <oth@google.com> Tue Feb 26 18:09:36 2019 +0000
tree 21dc508752d4b55174dd5a9092ee53b4db5d1cd6
parent fb19bf21b55ab03d7a98b1b2c25bcee433f801e9

Re-run glgen/gen

Corresponding change to glgen attempts to generate code closer to
manual edits in cpp files here.

Bug: 126352534
Bug: 124064285

Test: run frameworks/native/opengl/tools/glgen/gen, copy outputs, build.
Change-Id: I32a62dfc80ba87d689ff366b83650c9a3b6f872d

core/jni/android_opengl_GLES30.cpp

diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp
index 9aca866..9922398 100644
--- a/core/jni/android_opengl_GLES30.cpp
+++ b/core/jni/android_opengl_GLES30.cpp
@@ -3010,6 +3010,7 @@
 
     if (_exception) {
         jniThrowException(_env, _exceptionType, _exceptionMessage);
+        return (jint)0;
     }
     return (jint)_returnValue;
 }
@@ -3979,6 +3980,7 @@
 
     if (_exception) {
         jniThrowException(_env, _exceptionType, _exceptionMessage);
+        return (jint)0;
     }
     return (jint)_returnValue;
 }