commit 6aff9068f91fdfef0bc55fda0721c180c0de9284
author Pablo Ceballos <pceballos@google.com> Thu Oct 01 18:35:39 2015 -0700
committer Pablo Ceballos <pceballos@google.com> Thu Nov 05 20:14:34 2015 -0800
tree bcd113a45e8c84e5f2bc9d9b45aba47562bbbf28
parent c406898e8c8cd8003b4dbc55596f313db278e8ee

jni: Regenerated EGL/GLES JNI files to support null arguments

Bug 9321681

Change-Id: I397c1fbdfcc38a697b4f608546822a739e55e1d9

core/jni/android_opengl_GLES31Ext.cpp

diff --git a/core/jni/android_opengl_GLES31Ext.cpp b/core/jni/android_opengl_GLES31Ext.cpp
index 180c693..5be7be0 100644
--- a/core/jni/android_opengl_GLES31Ext.cpp
+++ b/core/jni/android_opengl_GLES31Ext.cpp
@@ -646,13 +646,9 @@
     const char * _exceptionMessage = NULL;
     const char* _nativelabel = 0;
 
-    if (!label) {
-        _exception = 1;
-        _exceptionType = "java/lang/IllegalArgumentException";
-        _exceptionMessage = "label == null";
-        goto exit;
+    if (label) {
+        _nativelabel = _env->GetStringUTFChars(label, 0);
     }
-    _nativelabel = _env->GetStringUTFChars(label, 0);
 
     glObjectLabelKHR(
         (GLenum)identifier,
@@ -660,8 +656,6 @@
         (GLsizei)length,
         (GLchar *)_nativelabel
     );
-
-exit:
     if (_nativelabel) {
         _env->ReleaseStringUTFChars(label, _nativelabel);
     }