diff options
| author | 2015-03-20 15:08:45 -0700 | |
|---|---|---|
| committer | 2015-03-20 15:09:35 -0700 | |
| commit | 206666790ad35c5dcea3de1f85424ad6a5abbb4d (patch) | |
| tree | e3a62a9c6ce68e1e506eed45fb0bc7224c152e7a | |
| parent | 79ec42e6a3c6a6f6a00ef3ad92221a5ad2149aa9 (diff) | |
unhide AllocationAdapter APIs
Change-Id: Id7ff10c7b09a5bedd9952602dd394e76b4fae8b1
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | rs/java/android/renderscript/AllocationAdapter.java | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 29f0a29e4864..77b0fdd138b9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26724,8 +26724,11 @@ package android.renderscript { public class AllocationAdapter extends android.renderscript.Allocation { method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation); method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation); + method public static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type); + method public void setArray(int, int); method public void setFace(android.renderscript.Type.CubemapFace); method public void setLOD(int); + method public void setX(int); method public void setY(int); method public void setZ(int); } diff --git a/api/system-current.txt b/api/system-current.txt index c98f7a334693..d2303111e159 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28520,8 +28520,11 @@ package android.renderscript { public class AllocationAdapter extends android.renderscript.Allocation { method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation); method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation); + method public static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type); + method public void setArray(int, int); method public void setFace(android.renderscript.Type.CubemapFace); method public void setLOD(int); + method public void setX(int); method public void setY(int); method public void setZ(int); } diff --git a/rs/java/android/renderscript/AllocationAdapter.java b/rs/java/android/renderscript/AllocationAdapter.java index 183726fb2fc6..35d59ddca736 100644 --- a/rs/java/android/renderscript/AllocationAdapter.java +++ b/rs/java/android/renderscript/AllocationAdapter.java @@ -136,7 +136,7 @@ public class AllocationAdapter extends Allocation { /** - * @hide + * * Set the active X. The x value must be within the range for * the allocation being adapted. * @@ -208,7 +208,7 @@ public class AllocationAdapter extends Allocation { } /** - * @hide + * */ public void setArray(int arrayNum, int arrayVal) { if (mAdaptedAllocation.getType().getArray(arrayNum) == 0) { @@ -242,7 +242,7 @@ public class AllocationAdapter extends Allocation { } /** - * @hide + * * * Create an arbitrary window into the base allocation * The type describes the shape of the window. |