Merge "[RenderScript] Unhide getByteBuffer and getStride for support lib." into nyc-dev
am: 0ed6d7a09c
* commit '0ed6d7a09c91d6836a9fcfe6d5c136416a60476b':
[RenderScript] Unhide getByteBuffer and getStride for support lib.
Change-Id: Ibb60ded7991cdcfde7a467a371f3f0cf458a6f1d
diff --git a/v8/renderscript/api/current.txt b/v8/renderscript/api/current.txt
index 929bd5f..3d135b1 100644
--- a/v8/renderscript/api/current.txt
+++ b/v8/renderscript/api/current.txt
@@ -70,9 +70,11 @@
method public static android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type, int);
method public static android.support.v8.renderscript.Allocation createTyped(android.support.v8.renderscript.RenderScript, android.support.v8.renderscript.Type);
method public void generateMipmaps();
+ method public java.nio.ByteBuffer getByteBuffer();
method public int getBytesSize();
method public android.support.v8.renderscript.Element getElement();
method public long getIncAllocID();
+ method public long getStride();
method public android.support.v8.renderscript.Type getType();
method public int getUsage();
method public void ioReceive();
diff --git a/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java b/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
index a2a648f..2384518 100644
--- a/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
+++ b/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
@@ -510,7 +510,6 @@
ioSend();
}
/**
- * @hide
* Gets or creates a ByteBuffer that contains the raw data of the current Allocation.
* <p> If the Allocation is created with USAGE_IO_INPUT, the returned ByteBuffer
* would contain the up-to-date data as READ ONLY.
@@ -554,7 +553,6 @@
}
/**
- * @hide
* Gets the stride of the Allocation.
* For a 2D or 3D Allocation, the raw data maybe padded so that each row of
* the Allocation has certain alignment. The size of each row including such