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

Commit caa22c22 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Fix some broken docs in android.media" into main

parents a3de0c1e afca5e6a

api/javadoc-lint-baseline

+0 −8
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ android/media/AudioManager.java:287: lint: Unresolved link/see tag "android.medi 
android/media/AudioManager.java:311: lint: Unresolved link/see tag "android.media.audiopolicy.AudioVolumeGroup" in android.media.AudioManager [101]

android/media/AudioManager.java:313: lint: Unresolved link/see tag "android.media.audiopolicy.AudioVolumeGroup" in android.media.AudioManager [101]

android/media/AudioMetadata.java:118: lint: Unresolved link/see tag "android.media.AudioPresentation.ContentClassifier One of {@link android.media.AudioPresentation#CONTENT_UNKNOWN AudioPresentation#CONTENT_UNKNOWN},     {@link android.media.AudioPresentation#CONTENT_MAIN AudioPresentation#CONTENT_MAIN},     {@link android.media.AudioPresentation#CONTENT_MUSIC_AND_EFFECTS AudioPresentation#CONTENT_MUSIC_AND_EFFECTS},     {@link android.media.AudioPresentation#CONTENT_VISUALLY_IMPAIRED AudioPresentation#CONTENT_VISUALLY_IMPAIRED},     {@link android.media.AudioPresentation#CONTENT_HEARING_IMPAIRED AudioPresentation#CONTENT_HEARING_IMPAIRED},     {@link android.media.AudioPresentation#CONTENT_DIALOG AudioPresentation#CONTENT_DIALOG},     {@link android.media.AudioPresentation#CONTENT_COMMENTARY AudioPresentation#CONTENT_COMMENTARY},     {@link android.media.AudioPresentation#CONTENT_EMERGENCY AudioPresentation#CONTENT_EMERGENCY},     {@link android.media.AudioPresentation#CONTENT_VOICEOVER AudioPresentation#CONTENT_VOICEOVER}." in android.media.AudioMetadata.Format [101]

android/media/MediaRouter2.java:162: lint: Unresolved link/see tag "#getInstance(android.content.Context,java.lang.String)" in android.media.MediaRouter2 [101]

android/media/midi/MidiUmpDeviceService.java:-1: lint: Unresolved link/see tag "#MidiDeviceService" in android.media.midi.MidiUmpDeviceService [101]

android/media/tv/SectionRequest.java:44: lint: Unresolved link/see tag "android.media.tv.BroadcastInfoRequest.RequestOption BroadcastInfoRequest.RequestOption" in android.media.tv.SectionRequest [101]

android/media/tv/SectionResponse.java:39: lint: Unresolved link/see tag "android.media.tv.BroadcastInfoRequest.RequestOption BroadcastInfoRequest.RequestOption" in android.media.tv.SectionResponse [101]

android/media/tv/TableRequest.java:48: lint: Unresolved link/see tag "android.media.tv.BroadcastInfoRequest.RequestOption BroadcastInfoRequest.RequestOption" in android.media.tv.TableRequest [101]
@@ -241,12 +239,6 @@ com/android/internal/policy/PhoneWindow.java:172: lint: Unresolved link/see tag 
com/android/server/broadcastradio/aidl/ConversionUtils.java:70: lint: Unresolved link/see tag "IdentifierType#DAB_SID_EXT" in android [101]

com/android/server/broadcastradio/aidl/ConversionUtils.java:70: lint: Unresolved link/see tag "ProgramSelector#IDENTIFIER_TYPE_DAB_DMB_SID_EXT" in android [101]

com/android/server/broadcastradio/aidl/ConversionUtils.java:70: lint: Unresolved link/see tag "RadioTuner" in android [101]

com/android/server/media/MediaSessionRecord.java:104: lint: Unresolved link/see tag "ComponentName" in android [101]

com/android/server/media/MediaSessionRecord.java:104: lint: Unresolved link/see tag "IllegalArgumentException" in android [101]

com/android/server/media/MediaSessionRecord.java:104: lint: Unresolved link/see tag "MediaSession#setMediaButtonBroadcastReceiver(ComponentName)" in android [101]

com/android/server/media/MediaSessionRecord.java:114: lint: Unresolved link/see tag "IllegalArgumentException" in android [101]

com/android/server/media/MediaSessionRecord.java:114: lint: Unresolved link/see tag "MediaSession#setMediaButtonReceiver(PendingIntent)" in android [101]

com/android/server/media/MediaSessionRecord.java:114: lint: Unresolved link/see tag "PendingIntent" in android [101]

com/android/server/pm/PackageInstallerSession.java:313: lint: Unresolved link/see tag "Build.VERSION_CODES#S API 31" in android [101]

com/android/server/pm/PackageInstallerSession.java:313: lint: Unresolved link/see tag "PackageInstaller.SessionParams#setRequireUserAction" in android [101]

com/android/server/pm/PackageInstallerSession.java:327: lint: Unresolved link/see tag "#requestUserPreapproval(PreapprovalDetails, IntentSender)" in android [101]

media/java/android/media/MediaRouter2.java

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ public final class MediaRouter2 { 
    /**

     * Returns the current {@link RouteListingPreference} of the target router.

     *

     * <p>If this instance was created using {@link #getInstance(Context, String)}, then it returns

     * <p>If this instance was created using {@code #getInstance(Context, String)}, then it returns

     * the last {@link RouteListingPreference} set by the process this router was created for.

     *

     * @see #setRouteListingPreference(RouteListingPreference)

media/java/android/media/midi/MidiUmpDeviceService.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import java.util.List; 
 * of {@link MidiReceiver}s for sending data out the output ports.

 *

 * Unlike traditional MIDI byte streams, only complete UMPs should be sent.

 * Unlike with {@link #MidiDeviceService}, the number of input and output ports must be equal.

 * Unlike with {@link MidiDeviceService}, the number of input and output ports must be equal.

 *

 * <p>To extend this class, you must declare the service in your manifest file with

 * an intent filter with the {@link #SERVICE_INTERFACE} action

services/core/java/com/android/server/media/MediaSessionRecord.java

+11 −8
Original line number Diff line number Diff line
@@ -97,20 +97,23 @@ import java.util.concurrent.CopyOnWriteArrayList; 
public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionRecordImpl {



    /**

     * {@link MediaSession#setMediaButtonBroadcastReceiver(ComponentName)} throws an {@link

     * IllegalArgumentException} if the provided {@link ComponentName} does not resolve to a valid

     * {@link android.content.BroadcastReceiver broadcast receiver} for apps targeting Android U and

     * above. For apps targeting Android T and below, the request will be ignored.

     * {@link android.media.session.MediaSession#setMediaButtonBroadcastReceiver(

     * android.content.ComponentName)} throws an {@link

     * java.lang.IllegalArgumentException} if the provided {@link android.content.ComponentName}

     * does not resolve to a valid {@link android.content.BroadcastReceiver broadcast receiver}

     * for apps targeting Android U and above. For apps targeting Android T and below, the request

     * will be ignored.

     */

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    static final long THROW_FOR_INVALID_BROADCAST_RECEIVER = 270049379L;



    /**

     * {@link MediaSession#setMediaButtonReceiver(PendingIntent)} throws an {@link

     * IllegalArgumentException} if the provided {@link PendingIntent} targets an {@link

     * android.app.Activity activity} for apps targeting Android V and above. For apps targeting

     * Android U and below, the request will be ignored.

     * {@link android.media.session.MediaSession#setMediaButtonReceiver(android.app.PendingIntent)}

     * throws an {@link java.lang.IllegalArgumentException} if the provided

     * {@link android.app.PendingIntent} targets an {@link android.app.Activity activity} for

     * apps targeting Android V and above. For apps targeting Android U and below, the request will

     * be ignored.

     */

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM)