Merge "Enable use of Surface as a native window in EGL14 wrapper." into jb-mr1-dev

Author: Jeff Brown

opengl/java/android/opengl/EGL14.java

@@ -248,6 +248,8 @@ public static EGLSurface eglCreateWindowSurface(EGLDisplay dpy,
         } else if (win instanceof SurfaceHolder) {
             SurfaceHolder holder = (SurfaceHolder)win;
             sur = holder.getSurface();
+        } else if (win instanceof Surface) {
+            sur = (Surface) win;
         }
 
         EGLSurface surface;
@@ -259,7 +261,7 @@ public static EGLSurface eglCreateWindowSurface(EGLDisplay dpy,
         } else {
             throw new java.lang.UnsupportedOperationException(
                 "eglCreateWindowSurface() can only be called with an instance of " +
-                "SurfaceView, SurfaceTexture or SurfaceHolder at the moment, " +
+                "Surface, SurfaceView, SurfaceTexture or SurfaceHolder at the moment, " +
                 "this will be fixed later.");
         }