Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df0c84f9 authored by Jamie Gennis's avatar Jamie Gennis
Browse files

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
parent b8a9e15c

core/java/android/view/Surface.java

+14 −14
Original line number Diff line number Diff line
@@ -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)