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

Commit 66dea739 authored by RoboErik's avatar RoboErik
Browse files

Add playback state and metadata to dump 

Change-Id: I813ff23c496f75776c8bd63f78bbe87683b19bc0
parent b94d4128

api/current.txt

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

    method public long getLong(java.lang.String);

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

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

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

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

    method public int size();

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

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

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

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

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

    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 Original line Diff line number Diff line
@@ -294,6 +294,15 @@ public final class MediaMetadata implements Parcelable { 
        dest.writeBundle(mBundle);

        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

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

     * integer key that {@link MediaMetadataEditor} uses.

     * integer key that {@link MediaMetadataEditor} uses.

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

+14 −0
Original line number Original line 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

    @Override

    public int describeContents() {

    public int describeContents() {

        return 0;

        return 0;

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

+9 −0
Original line number Original line 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 + "transport controls enabled=" + mTransportPerformerEnabled);

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

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

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

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

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

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

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

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

        int size = mRequests.size();

        int size = mRequests.size();

        for (int i = 0; i < size; i++) {

        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()));

        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() {

    private void onDestroy() {

        mService.destroySession(this);

        mService.destroySession(this);

    }

    }