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

Commit 9c844eac authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AudioManager.getIndependentStreamTypes javadoc" into udc-dev am: 341c1972 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21917020



Change-Id: Ie46ed29d00f7958840e804e5621c4baa5a9777b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15dcf700 341c1972

media/java/android/media/AudioManager.java

+4 −1
Original line number Diff line number Diff line
@@ -9564,7 +9564,10 @@ public class AudioManager { 
     * A stream type is considered independent when the volume changes of that type do not

     * affect any other independent volume control stream type.

     * An independent stream type is its own alias when using {@link #getStreamTypeAlias(int)}.

     * @return list of independent stream types.

     * @return list of independent stream types, where each value can be one of

     *     {@link #STREAM_VOICE_CALL}, {@link #STREAM_SYSTEM}, {@link #STREAM_RING},

     *     {@link #STREAM_MUSIC}, {@link #STREAM_ALARM}, {@link #STREAM_NOTIFICATION},

     *     {@link #STREAM_DTMF} and {@link #STREAM_ACCESSIBILITY}.

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED)