Merge "Revert "Cleanup Bitmap JNI""

1 files changed, 10 insertions, 0 deletions

diff --git a/opengl/java/android/opengl/GLUtils.java b/opengl/java/android/opengl/GLUtils.java
index 4d890c9438a3..a9d33dd23827 100644
--- a/opengl/java/android/opengl/GLUtils.java
+++ b/opengl/java/android/opengl/GLUtils.java
@@ -29,6 +29,14 @@ import javax.microedition.khronos.egl.EGL11;
 
 public final class GLUtils {
 
+    /*
+     * We use a class initializer to allow the native code to cache some
+     * field offsets.
+     */
+    static {
+        nativeClassInit();
+    }
+
     private GLUtils() {
     }
 
@@ -267,6 +275,8 @@ public final class GLUtils {
      */
     native public static void setTracingLevel(int level);
 
+    native private static void nativeClassInit();
+
     native private static int native_getInternalFormat(Bitmap bitmap);
     native private static int native_getType(Bitmap bitmap);
     native private static int native_texImage2D(int target, int level, int internalformat,