Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kyunglyul Hyun
2021-04-14 03:18:06 +00:00
committed by Android (Google) Code Review
parent 11d3489ba1 4879480b99
commit 90e33e72cb
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -25217,6 +25217,7 @@ package android.media.session {
method public float getPlaybackSpeed(); method public float getPlaybackSpeed();
method public long getPosition(); method public long getPosition();
method public int getState(); method public int getState();
method public boolean isActive();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final long ACTION_FAST_FORWARD = 64L; // 0x40L field public static final long ACTION_FAST_FORWARD = 64L; // 0x40L
field public static final long ACTION_PAUSE = 2L; // 0x2L field public static final long ACTION_PAUSE = 2L; // 0x2L

4
core/api/module-lib-current.txt
View File

@@ -161,10 +161,6 @@ package android.media.session {
method public void onVolumeChanged(@NonNull android.media.session.MediaSession.Token, int); 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 { package android.net {

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

@@ -216,7 +216,7 @@ public class PipMediaController {
} }
ArrayList<RemoteAction> mediaActions = new ArrayList<>(); ArrayList<RemoteAction> mediaActions = new ArrayList<>();
boolean isPlaying = mMediaController.getPlaybackState().isActiveState(); boolean isPlaying = mMediaController.getPlaybackState().isActive();
long actions = mMediaController.getPlaybackState().getActions(); long actions = mMediaController.getPlaybackState().getActions();
// Prev action // Prev action

18
media/java/android/media/session/PlaybackState.java
View File

@@ -19,7 +19,6 @@ import android.annotation.DrawableRes;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.LongDef; import android.annotation.LongDef;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -493,15 +492,26 @@ public final class PlaybackState implements Parcelable {
/** /**
* Returns whether this is considered as an active playback state. * Returns whether this is considered as an active playback state.
* @hide * <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>
*/ */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public boolean isActive() {
public boolean isActiveState() {
switch (mState) { switch (mState) {
case PlaybackState.STATE_FAST_FORWARDING: case PlaybackState.STATE_FAST_FORWARDING:
case PlaybackState.STATE_REWINDING: case PlaybackState.STATE_REWINDING:
case PlaybackState.STATE_SKIPPING_TO_PREVIOUS: case PlaybackState.STATE_SKIPPING_TO_PREVIOUS:
case PlaybackState.STATE_SKIPPING_TO_NEXT: case PlaybackState.STATE_SKIPPING_TO_NEXT:
case PlaybackState.STATE_SKIPPING_TO_QUEUE_ITEM:
case PlaybackState.STATE_BUFFERING: case PlaybackState.STATE_BUFFERING:
case PlaybackState.STATE_CONNECTING: case PlaybackState.STATE_CONNECTING:
case PlaybackState.STATE_PLAYING: case PlaybackState.STATE_PLAYING:

2
services/core/java/com/android/server/media/MediaSessionRecord.java
View File

@@ -384,7 +384,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
if (mPlaybackState == null) { if (mPlaybackState == null) {
return false; return false;
} }
return mPlaybackState.isActiveState() == expected; return mPlaybackState.isActive() == expected;
} }
/** /**