summaryrefslogtreecommitdiffstats
path: root/core/java/android/speech
diff options
context:
space:
mode:
authorAndy Stadler <>2009-04-10 16:24:47 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-10 16:24:47 -0700
commitf8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 (patch)
tree1dd68eeddbfa83d571a3544d6d2e25ba9be21b49 /core/java/android/speech
parent1eb75a0b3770177c3f0d0c2e843f80fc34451ef5 (diff)
downloadframeworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.zip
frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.gz
frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.bz2
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'core/java/android/speech')
-rw-r--r--core/java/android/speech/srec/UlawEncoderInputStream.java5
-rw-r--r--core/java/android/speech/srec/WaveHeader.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/speech/srec/UlawEncoderInputStream.java b/core/java/android/speech/srec/UlawEncoderInputStream.java
index 132fe027..a488ead 100644
--- a/core/java/android/speech/srec/UlawEncoderInputStream.java
+++ b/core/java/android/speech/srec/UlawEncoderInputStream.java
@@ -26,8 +26,9 @@ import java.io.InputStream;
/**
* InputStream which transforms 16 bit pcm data to ulaw data.
- *
- * @hide pending API council approval
+ *
+ * Not yet ready to be supported, so
+ * @hide
*/
public final class UlawEncoderInputStream extends InputStream {
private final static String TAG = "UlawEncoderInputStream";
diff --git a/core/java/android/speech/srec/WaveHeader.java b/core/java/android/speech/srec/WaveHeader.java
index a99496d..4c3b172 100644
--- a/core/java/android/speech/srec/WaveHeader.java
+++ b/core/java/android/speech/srec/WaveHeader.java
@@ -30,7 +30,9 @@ import java.io.OutputStream;
* <li> bitsPerSample - usually 16 for PCM, 8 for ALAW, or 8 for ULAW.
* <li> numBytes - size of audio data after this header, in bytes.
* </ul>
- * @hide pending API council approval
+ *
+ * Not yet ready to be supported, so
+ * @hide
*/
public class WaveHeader {