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

Commit e19f6595 authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

Merge "Document the expected value of volume control id parameter" into... 

Merge "Document the expected value of volume control id parameter" into udc-dev am: ec281057 am: ab372b13

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



Change-Id: I4e74d2bfe1811182b2192942e02d773d3eb92394
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fdddf012 ab372b13

media/java/android/media/session/MediaController.java

+6 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.media.AudioAttributes; 
import android.media.AudioManager;

import android.media.MediaMetadata;

import android.media.Rating;

import android.media.RoutingSessionInfo;

import android.media.VolumeProvider;

import android.media.VolumeProvider.ControlType;

import android.media.session.MediaSession.QueueItem;
@@ -1001,8 +1002,11 @@ public final class MediaController { 
         * @param maxVolume The max volume. Should be equal or greater than zero.

         * @param currentVolume The current volume. Should be in the interval [0, maxVolume].

         * @param audioAttrs The audio attributes for this playback. Should not be null.

         * @param volumeControlId The volume control ID. This is used for matching

         *                        {@link RoutingSessionInfo} and {@link MediaSession}.

         * @param volumeControlId The {@link RoutingSessionInfo#getId() routing session id} of the

         *     {@link RoutingSessionInfo} associated with this controller, or null if not

         *     applicable. This id allows mapping this controller to a routing session which, when

         *     applicable, provides information about the remote device, and support for volume

         *     adjustment.

         * @hide

         */

        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)