From df0c84f90894c677c50bdc967a0598f516ac86d7 Mon Sep 17 00:00:00 2001 From: Jamie Gennis Date: Sun, 28 Aug 2011 15:09:17 -0700 Subject: Surface: move the SurfaceTexture ctor This change moves the Surface ctor that takes a SurfaceTexture to the portion of the file containing the public APIs. Change-Id: I192df7bf5c0e6d0d0607bd577d72646312b2f717 --- core/java/android/view/Surface.java | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 5e7e50987ecb..ef3d3fa59a93 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -35,6 +35,20 @@ public class Surface implements Parcelable { public static final int ROTATION_180 = 2; public static final int ROTATION_270 = 3; + /** + * Create Surface from a SurfaceTexture. + * + * @param surfaceTexture The {@link SurfaceTexture} that is updated by this Surface. + * @hide + */ + public Surface(SurfaceTexture surfaceTexture) { + if (DEBUG_RELEASE) { + mCreationStack = new Exception(); + } + mCanvas = new CompatibleCanvas(); + initFromSurfaceTexture(surfaceTexture); + } + /** * Does this object hold a valid surface? Returns true if it holds * a physical surface, so lockCanvas() will succeed. Otherwise @@ -222,20 +236,6 @@ public class Surface implements Parcelable { native private static void nativeClassInit(); static { nativeClassInit(); } - /** - * Create Surface from a SurfaceTexture. - * - * @param surfaceTexture The {@link SurfaceTexture} that is updated by this Surface. - * @hide - */ - public Surface(SurfaceTexture surfaceTexture) { - if (DEBUG_RELEASE) { - mCreationStack = new Exception(); - } - mCanvas = new CompatibleCanvas(); - initFromSurfaceTexture(surfaceTexture); - } - /** create a surface @hide */ public Surface(SurfaceSession s, int pid, int display, int w, int h, int format, int flags) -- cgit v1.2.3-59-g8ed1b