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

Commit 56b6ff07 authored by Orion Hodson's avatar Orion Hodson Committed by Android (Google) Code Review
Browse files

Merge "Revert "Change PlaybackState#isActiveState to isActive"" into sc-dev

parents ed94e992 d077dbf4

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -25218,7 +25218,6 @@ package android.media.session { 
    method public float getPlaybackSpeed();

    method public long getPosition();

    method public int getState();

    method public boolean isActive();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final long ACTION_FAST_FORWARD = 64L; // 0x40L

    field public static final long ACTION_PAUSE = 2L; // 0x2L

core/api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ package android.media.session { 
    method public void onVolumeChanged(@NonNull android.media.session.MediaSession.Token, int);

  }



  public final class PlaybackState implements android.os.Parcelable {

    method public boolean isActiveState();

  }



}



package android.net {

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ public class PipMediaController { 
        }



        ArrayList<RemoteAction> mediaActions = new ArrayList<>();

        boolean isPlaying = mMediaController.getPlaybackState().isActive();

        boolean isPlaying = mMediaController.getPlaybackState().isActiveState();

        long actions = mMediaController.getPlaybackState().getActions();



        // Prev action

media/java/android/media/session/PlaybackState.java

+4 −14
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.annotation.DrawableRes; 
import android.annotation.IntDef;

import android.annotation.LongDef;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;
@@ -492,26 +493,15 @@ public final class PlaybackState implements Parcelable { 


    /**

     * Returns whether this is considered as an active playback state.

     * <p>

     * The playback state is considered as an active if the state is one of the following:

     * <ul>

     * <li>{@link #STATE_BUFFERING}</li>

     * <li>{@link #STATE_CONNECTING}</li>

     * <li>{@link #STATE_FAST_FORWARDING}</li>

     * <li>{@link #STATE_PLAYING}</li>

     * <li>{@link #STATE_REWINDING}</li>

     * <li>{@link #STATE_SKIPPING_TO_NEXT}</li>

     * <li>{@link #STATE_SKIPPING_TO_PREVIOUS}</li>

     * <li>{@link #STATE_SKIPPING_TO_QUEUE_ITEM}</li>

     * </ul>

     * @hide

     */

    public boolean isActive() {

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public boolean isActiveState() {

        switch (mState) {

            case PlaybackState.STATE_FAST_FORWARDING:

            case PlaybackState.STATE_REWINDING:

            case PlaybackState.STATE_SKIPPING_TO_PREVIOUS:

            case PlaybackState.STATE_SKIPPING_TO_NEXT:

            case PlaybackState.STATE_SKIPPING_TO_QUEUE_ITEM:

            case PlaybackState.STATE_BUFFERING:

            case PlaybackState.STATE_CONNECTING:

            case PlaybackState.STATE_PLAYING:

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

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 
        if (mPlaybackState == null) {

            return false;

        }

        return mPlaybackState.isActive() == expected;

        return mPlaybackState.isActiveState() == expected;

    }



    /**