diff options
| author | Eric Laurent <elaurent@google.com> | 2012-04-19 10:16:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 10:16:38 -0700 |
| commit | 6db653355bbf79f4bfe666fb96262c0df2ec34aa (patch) | |
| tree | c2adbb3beeb52b139ad5a273e4fc0f9c3c4b3231 /media/java | |
| parent | 7b5f22e11c37ef481ca5bc2b7d07c3c33c6ad3e8 (diff) | |
| parent | ff2577da370f15b8288f547575c28393477d57b1 (diff) | |
| download | frameworks_base-6db653355bbf79f4bfe666fb96262c0df2ec34aa.zip frameworks_base-6db653355bbf79f4bfe666fb96262c0df2ec34aa.tar.gz frameworks_base-6db653355bbf79f4bfe666fb96262c0df2ec34aa.tar.bz2 | |
Merge "unhide API for synchronous audio capture."
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioRecord.java | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaSyncEvent.java | 3 | ||||
| -rw-r--r-- | media/java/android/media/ToneGenerator.java | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index 34bf368..81e8028 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -530,7 +530,6 @@ public class AudioRecord * @throws IllegalStateException * @param syncEvent event that triggers the capture. * @see MediaSyncEvent - * @hide */ public void startRecording(MediaSyncEvent syncEvent) throws IllegalStateException { diff --git a/media/java/android/media/MediaSyncEvent.java b/media/java/android/media/MediaSyncEvent.java index d2a0735..31af6b5 100644 --- a/media/java/android/media/MediaSyncEvent.java +++ b/media/java/android/media/MediaSyncEvent.java @@ -23,7 +23,6 @@ package android.media; * only when the playback on a particular audio session is complete. * The audio session ID is retrieved from a player (e.g {@link MediaPlayer}, {@link AudioTrack} or * {@link ToneGenerator}) by use of the getAudioSessionId() method. - * @hide */ public class MediaSyncEvent { @@ -49,7 +48,7 @@ public class MediaSyncEvent { * <p>The type specifies which kind of event is monitored. * For instance, event {@link #SYNC_EVENT_PRESENTATION_COMPLETE} corresponds to the audio being * presented to the user on a particular audio session. - * @param type the synchronization event type. + * @param eventType the synchronization event type. * @return the MediaSyncEvent created. * @throws java.lang.IllegalArgumentException */ diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java index 4907a13..5592105 100644 --- a/media/java/android/media/ToneGenerator.java +++ b/media/java/android/media/ToneGenerator.java @@ -880,7 +880,6 @@ public class ToneGenerator * * @return the ID of the audio session this ToneGenerator belongs to or 0 if an error * occured. - * @hide */ public native final int getAudioSessionId(); |