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

Commit 560717b9 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Android (Google) Code Review
Browse files

Merge "Add maxTargetSDK to MediaController#controlsSameSession"

parents facd9760 0c7db846

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -28835,7 +28835,6 @@ package android.media.session { 
  public final class MediaController {

    ctor public MediaController(@NonNull android.content.Context, @NonNull android.media.session.MediaSession.Token);

    method public void adjustVolume(int, int);

    method @Deprecated public boolean controlsSameSession(@Nullable android.media.session.MediaController);

    method public boolean dispatchMediaButtonEvent(@NonNull android.view.KeyEvent);

    method @Nullable public android.os.Bundle getExtras();

    method public long getFlags();

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -28596,7 +28596,6 @@ package android.media.session { 
  public final class MediaController {

    ctor public MediaController(@NonNull android.content.Context, @NonNull android.media.session.MediaSession.Token);

    method public void adjustVolume(int, int);

    method @Deprecated public boolean controlsSameSession(@Nullable android.media.session.MediaController);

    method public boolean dispatchMediaButtonEvent(@NonNull android.view.KeyEvent);

    method @Nullable public android.os.Bundle getExtras();

    method public long getFlags();

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

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.app.PendingIntent;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.pm.ParceledListSlice;

import android.media.AudioAttributes;
@@ -32,6 +33,7 @@ import android.media.VolumeProvider; 
import android.media.VolumeProvider.ControlType;

import android.media.session.MediaSession.QueueItem;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;
@@ -462,10 +464,11 @@ public final class MediaController { 
    }



    /**

     * @hide

     * Returns whether this and {@code other} media controller controls the same session.

     * @deprecated Check equality of {@link #getSessionToken() tokens} instead.

     */

    @Deprecated

    @UnsupportedAppUsage(publicAlternatives = "Check equality of {@link #getSessionToken() tokens} "

            + "instead.", maxTargetSdk = Build.VERSION_CODES.R)

    public boolean controlsSameSession(@Nullable MediaController other) {

        if (other == null) return false;

        return mToken.equals(other.mToken);