Fix inconsistencies in Android annotations

android-sdk-annotations/android/opengl/annotations.xml

@@ -5,6 +5,12 @@
     <item name='android.opengl.GLES11Ext void glMatrixIndexPointerOES(int, int, int, java.nio.Buffer) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture createTexture(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.opengl.GLSurfaceView.EGLWindowSurfaceFactory void destroySurface(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.ETC1Util void writeTexture(android.opengl.ETC1Util.ETC1Texture, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -14,6 +20,9 @@
     <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture createTexture(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLSurfaceView.EGLConfigChooser javax.microedition.khronos.egl.EGLConfig chooseConfig(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.GLUtils int getType(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,6 +35,12 @@
     <item name='android.opengl.GLUtils void texSubImage2D(int, int, int, int, android.graphics.Bitmap) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture compressTexture(java.nio.Buffer, int, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.opengl.GLSurfaceView.EGLContextFactory javax.microedition.khronos.egl.EGLContext createContext(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.Matrix void setRotateEulerM(float[], int, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -50,27 +65,24 @@
     <item name='android.opengl.Matrix void setRotateM(float[], int, float, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.opengl.GLSurfaceView GLSurfaceView(android.content.Context, android.util.AttributeSet) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.opengl.GLSurfaceView void surfaceCreated(android.view.SurfaceHolder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLSurfaceView GLSurfaceView(android.content.Context, android.util.AttributeSet) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.GLUtils int getInternalFormat(android.graphics.Bitmap) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.opengl.GLUtils java.lang.String getEGLErrorString(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture compressTexture(java.nio.Buffer, int, int, int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.opengl.ETC1Util void writeTexture(android.opengl.ETC1Util.ETC1Texture, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.opengl.GLES20 void glVertexAttribPointer(int, int, int, boolean, int, java.nio.Buffer) 5'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLUtils java.lang.String getEGLErrorString(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.Matrix void frustumM(float[], int, float, float, float, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -92,15 +104,15 @@
     <item name='android.opengl.GLES10 void glVertexPointer(int, int, int, java.nio.Buffer) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLSurfaceView.EGLContextFactory void destroyContext(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLContext) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.GLSurfaceView GLSurfaceView(android.content.Context) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.opengl.GLUtils void texImage2D(int, int, int, android.graphics.Bitmap, int) 3'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.opengl.ETC1Util android.opengl.ETC1Util.ETC1Texture createTexture(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.opengl.Matrix void perspectiveM(float[], int, float, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -110,6 +122,9 @@
     <item name='android.opengl.GLES30 void glVertexAttribIPointer(int, int, int, int, java.nio.Buffer) 4'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.opengl.GLSurfaceView.EGLConfigChooser javax.microedition.khronos.egl.EGLConfig chooseConfig(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.opengl.Matrix void orthoM(float[], int, float, float, float, float, float, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>