Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix javadoc missing possible return value in AudioRecordingConfiguration" into nyc-dev am: 0316ed0766

Browse Source 
am: 0b52195b59

* commit '0b52195b597a5f7a2af734acaf114054ede9148b':
  Fix javadoc missing possible return value in AudioRecordingConfiguration

Change-Id: I82e88294061c4307e040f36b5fb4916b2dc1235b
This commit is contained in:
Jean-Michel Trivi
2016-05-11 00:17:44 +00:00
committed by android-build-merger
parent 2c71385a3b 0b52195b59
commit c4f569b2f8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/java/android/media/AudioRecordingConfiguration.java
View File

@@ -56,28 +56,35 @@ public final class AudioRecordingConfiguration implements Parcelable {
mPatchHandle = patchHandle;
}
// matches the sources that return false in MediaRecorder.isSystemOnlyAudioSource(source)
/** @hide */
@IntDef({
MediaRecorder.AudioSource.DEFAULT,
MediaRecorder.AudioSource.MIC,
MediaRecorder.AudioSource.VOICE_UPLINK,
MediaRecorder.AudioSource.VOICE_DOWNLINK,
MediaRecorder.AudioSource.VOICE_CALL,
MediaRecorder.AudioSource.CAMCORDER,
MediaRecorder.AudioSource.VOICE_RECOGNITION,
MediaRecorder.AudioSource.VOICE_COMMUNICATION
MediaRecorder.AudioSource.VOICE_COMMUNICATION,
MediaRecorder.AudioSource.UNPROCESSED
})
@Retention(RetentionPolicy.SOURCE)
public @interface AudioSource {}
// documented return values match the sources that return false
// in MediaRecorder.isSystemOnlyAudioSource(source)
/**
* Returns the audio source being used for the recording.
* @return one of {@link MediaRecorder.AudioSource#MIC},
* @return one of {@link MediaRecorder.AudioSource#DEFAULT},
* {@link MediaRecorder.AudioSource#MIC},
* {@link MediaRecorder.AudioSource#VOICE_UPLINK},
* {@link MediaRecorder.AudioSource#VOICE_DOWNLINK},
* {@link MediaRecorder.AudioSource#VOICE_CALL},
* {@link MediaRecorder.AudioSource#CAMCORDER},
* {@link MediaRecorder.AudioSource#VOICE_RECOGNITION},
* {@link MediaRecorder.AudioSource#VOICE_COMMUNICATION}.
* {@link MediaRecorder.AudioSource#VOICE_COMMUNICATION},
* {@link MediaRecorder.AudioSource#UNPROCESSED}.
*/
public @AudioSource int getClientAudioSource() { return mClientSource; }