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

Commit 4f854e0d authored by RoboErik's avatar RoboErik Committed by Android (Google) Code Review
Browse files

Merge "Add playback state and metadata to dump"

parents 9529d8f2 66dea739

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15203,6 +15203,7 @@ package android.media.session { 
    method public long getLong(java.lang.String);

    method public android.media.Rating getRating(java.lang.String);

    method public java.lang.String getString(java.lang.String);

    method public int size();

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

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final java.lang.String METADATA_KEY_ALBUM = "android.media.metadata.ALBUM";

media/java/android/media/session/MediaMetadata.java

+9 −0
Original line number Diff line number Diff line
@@ -294,6 +294,15 @@ public final class MediaMetadata implements Parcelable { 
        dest.writeBundle(mBundle);

    }



    /**

     * Get the number of fields in this metadata.

     *

     * @return The number of fields in the metadata.

     */

    public int size() {

        return mBundle.size();

    }



    /**

     * Helper for getting the String key used by {@link MediaMetadata} from the

     * integer key that {@link MediaMetadataEditor} uses.

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

+14 −0
Original line number Diff line number Diff line
@@ -224,6 +224,20 @@ public final class PlaybackState implements Parcelable { 


    }



    @Override

    public String toString() {

        StringBuilder bob = new StringBuilder("PlaybackState {");

        bob.append("state=").append(mState);

        bob.append(", position=").append(mPosition);

        bob.append(", buffered position=").append(mBufferPosition);

        bob.append(", rate=").append(mRate);

        bob.append(", updated=").append(mUpdateTime);

        bob.append(", actions=").append(mActions);

        bob.append(", error=").append(mErrorMessage);

        bob.append("}");

        return bob.toString();

    }



    @Override

    public int describeContents() {

        return 0;

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

+9 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { 
        pw.println(indent + "transport controls enabled=" + mTransportPerformerEnabled);

        pw.println(indent + "rating type=" + mRatingType);

        pw.println(indent + "controllers: " + mControllerCallbacks.size());

        pw.println(indent + "state=" + mPlaybackState.toString());

        pw.println(indent + "metadata:" + getShortMetadataString());

        pw.println(indent + "route requests {");

        int size = mRequests.size();

        for (int i = 0; i < size; i++) {
@@ -249,6 +251,13 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { 
        pw.println(indent + "params=" + (mRequest == null ? null : mRequest.toString()));

    }



    private String getShortMetadataString() {

        int fields = mMetadata == null ? 0 : mMetadata.size();

        String title = mMetadata == null ? null : mMetadata

                .getString(MediaMetadata.METADATA_KEY_TITLE);

        return "size=" + fields + ", title=" + title;

    }



    private void onDestroy() {

        mService.destroySession(this);

    }