Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4f569b2 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Fix javadoc missing possible return value in... 

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

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

Change-Id: I82e88294061c4307e040f36b5fb4916b2dc1235b
parents 2c71385a 0b52195b

media/java/android/media/AudioRecordingConfiguration.java

+10 −3
Original line number Diff line number Diff line
@@ -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; }