diff options
| author | Tim Murray <timmurray@google.com> | 2014-02-03 22:44:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 22:44:39 +0000 |
| commit | a392cdf375e4f43bea8c5398ed2b3bc993a31a77 (patch) | |
| tree | dc612c308590fa6e45501b11490aa4e1ce71ac26 /graphics | |
| parent | be878d8773cc841e5e144a6332c576c650e88126 (diff) | |
| parent | 9bad32c3830e45615a6b71e3f80ca7b95ef638b5 (diff) | |
| download | frameworks_base-a392cdf375e4f43bea8c5398ed2b3bc993a31a77.zip frameworks_base-a392cdf375e4f43bea8c5398ed2b3bc993a31a77.tar.gz frameworks_base-a392cdf375e4f43bea8c5398ed2b3bc993a31a77.tar.bz2 | |
am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
Remove hidden API setSurfaceTexture.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/Allocation.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index dca934f..12b3517 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -24,7 +24,6 @@ import android.content.res.AssetManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.view.Surface; -import android.graphics.SurfaceTexture; import android.util.Log; import android.util.TypedValue; import android.graphics.Canvas; @@ -127,17 +126,17 @@ public class Allocation extends BaseObj { public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010; /** - * The Allocation will be used as a {@link android.graphics.SurfaceTexture} - * consumer. This usage will cause the Allocation to be created as - * read-only. + * The Allocation will be used as a {@link android.view.Surface} + * consumer. This usage will cause the Allocation to be created + * as read-only. * */ public static final int USAGE_IO_INPUT = 0x0020; /** - * The Allocation will be used as a {@link android.graphics.SurfaceTexture} + * The Allocation will be used as a {@link android.view.Surface} * producer. The dimensions and format of the {@link - * android.graphics.SurfaceTexture} will be forced to those of the + * android.view.Surface} will be forced to those of the * Allocation. * */ @@ -1547,13 +1546,6 @@ public class Allocation extends BaseObj { } /** - * @hide - */ - public void setSurfaceTexture(SurfaceTexture st) { - setSurface(new Surface(st)); - } - - /** * Associate a {@link android.view.Surface} with this Allocation. This * operation is only valid for Allocations with {@link #USAGE_IO_OUTPUT}. * |