Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Surface: move the SurfaceTexture ctor"

Browse Source
This commit is contained in:
Jamie Gennis
2011-08-29 13:41:45 -07:00
committed by Android (Google) Code Review
parent f455e9a3b3 df0c84f908
commit a258f0c8ff
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/view/Surface.java
View File

@@ -35,6 +35,20 @@ public class Surface implements Parcelable {
public static final int ROTATION_180 = 2; public static final int ROTATION_180 = 2;
public static final int ROTATION_270 = 3; 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 * Does this object hold a valid surface? Returns true if it holds
* a physical surface, so lockCanvas() will succeed. Otherwise * a physical surface, so lockCanvas() will succeed. Otherwise
@@ -222,20 +236,6 @@ public class Surface implements Parcelable {
native private static void nativeClassInit(); native private static void nativeClassInit();
static { 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 */ /** create a surface @hide */
public Surface(SurfaceSession s, public Surface(SurfaceSession s,
int pid, int display, int w, int h, int format, int flags) int pid, int display, int w, int h, int format, int flags)