diff options
author | Jamie Gennis <jgennis@google.com> | 2011-08-29 13:41:45 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-29 13:41:45 -0700 |
commit | a258f0c8ffeb447aa8d3216ec276bc26b4f3f5d8 (patch) | |
tree | d22038f45456152c4303edac2a0ad1e00d958f81 /core | |
parent | f455e9a3b3fa2d4680750e7b65692e35d2bf4023 (diff) | |
parent | df0c84f90894c677c50bdc967a0598f516ac86d7 (diff) | |
download | frameworks_base-a258f0c8ffeb447aa8d3216ec276bc26b4f3f5d8.zip frameworks_base-a258f0c8ffeb447aa8d3216ec276bc26b4f3f5d8.tar.gz frameworks_base-a258f0c8ffeb447aa8d3216ec276bc26b4f3f5d8.tar.bz2 |
Merge "Surface: move the SurfaceTexture ctor"
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/view/Surface.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 5e7e509..ef3d3fa 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -36,6 +36,20 @@ public class Surface implements Parcelable { 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 * returns false. @@ -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) |