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

Commit d1661dcc authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "Unhide new SurfaceTexture & TextureView APIs"

parents 70544533 33efb231

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -9018,6 +9018,8 @@ package android.graphics { 














  public class SurfaceTexture {















    ctor public SurfaceTexture(int);













    method public void attachToGLContext(int);













    method public void detachFromGLContext();















    method public long getTimestamp();















    method public void getTransformMatrix(float[]);















    method public void release();










@@ -23305,6 +23307,7 @@ package android.view {













    method public android.graphics.Canvas lockCanvas(android.graphics.Rect);















    method protected final void onDraw(android.graphics.Canvas);















    method public void setOpaque(boolean);













    method public void setSurfaceTexture(android.graphics.SurfaceTexture);















    method public void setSurfaceTextureListener(android.view.TextureView.SurfaceTextureListener);















    method public void setTransform(android.graphics.Matrix);















    method public void unlockCanvasAndPost(android.graphics.Canvas);

























core/java/android/view/TextureView.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -676,7 +676,6 @@ public class TextureView extends View {













     *















     * @param surfaceTexture The {@link SurfaceTexture} that the view should use.















     * @see SurfaceTexture#detachFromGLContext()













     * @hide















     */















    public void setSurfaceTexture(SurfaceTexture surfaceTexture) {















        if (surfaceTexture == null) {

































graphics/java/android/graphics/SurfaceTexture.java



+1
−5




























Original line number
Diff line number
Diff line








@@ -172,8 +172,6 @@ public class SurfaceTexture {













     * This can be used to access the SurfaceTexture image contents from multiple OpenGL ES















     * contexts.  Note, however, that the image contents are only accessible from one OpenGL ES















     * context at a time.













     *













     * @hide















     */















    public void detachFromGLContext() {















        int err = nativeDetachFromGLContext();









@@ -194,8 +192,6 @@ public class SurfaceTexture {













     *















     * @param texName The name of the OpenGL ES texture that will be created.  This texture name















     * must be unusued in the OpenGL ES context that is current on the calling thread.













     *













     * @hide















     */















    public void attachToGLContext(int texName) {















        int err = nativeAttachToGLContext(texName);