Merge "Revert "Change PlaybackState#isActiveState to isActive"" into sc-dev
diff --git a/core/api/current.txt b/core/api/current.txt
index 3cd2494..0420714 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -25218,7 +25218,6 @@
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
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 2be8c9a..b653410 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -161,6 +161,10 @@
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 {
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java
index d4f229c..3af0ff0 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java
@@ -216,7 +216,7 @@
}
ArrayList<RemoteAction> mediaActions = new ArrayList<>();
- boolean isPlaying = mMediaController.getPlaybackState().isActive();
+ boolean isPlaying = mMediaController.getPlaybackState().isActiveState();
long actions = mMediaController.getPlaybackState().getActions();
// Prev action
diff --git a/media/java/android/media/session/PlaybackState.java b/media/java/android/media/session/PlaybackState.java
index 9eacc74..e7d30ebb 100644
--- a/media/java/android/media/session/PlaybackState.java
+++ b/media/java/android/media/session/PlaybackState.java
@@ -19,6 +19,7 @@
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 @@
/**
* 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:
diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index abcf4fb..b10d56b 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -384,7 +384,7 @@
if (mPlaybackState == null) {
return false;
}
- return mPlaybackState.isActive() == expected;
+ return mPlaybackState.isActiveState() == expected;
}
/**