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

Commit db80fadd authored by Ajay Panicker's avatar Ajay Panicker Committed by Myles Watson
Browse files

RE-APPLY: Use custom metadata object for all logging 

The metadata object in AVRCP handles null checks and fields properly
helping prevent crashes caused by poorly behaving media apps. Also add
the duration and track number and total number of tracks fields to the
metadata string.

Re-applying skipped change: Iaa9739f429795cbbb64b24eddfbf90beb8f090ba

Bug: 78562371
Fixes: 112863287
Test: Compile and "adb shell dumpsys bluetooth_manager"
Change-Id: I15398d28381ed42c24780bafa6116b47fed023f1
parent 8e2a967b

android/app/src/com/android/bluetooth/newavrcp/GPMWrapper.java

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ class GPMWrapper extends MediaPlayerWrapper { 
        if (currItem == null || !qitem.equals(mdata)) {

            if (DEBUG) {

                Log.d(TAG, "Metadata currently out of sync for Google Play Music");

                Log.d(TAG, "  └ Current queueItem: " + currItem);

                Log.d(TAG, "  └ Current metadata : " + getMetadata());

                Log.d(TAG, "  └ Current queueItem: " + qitem);

                Log.d(TAG, "  └ Current metadata : " + mdata);

            }

            return false;

        }

android/app/src/com/android/bluetooth/newavrcp/MediaPlayerWrapper.java

+8 −7
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ class MediaPlayerWrapper { 
            if (currItem == null || !qitem.equals(mdata)) {

                if (DEBUG) {

                    Log.d(TAG, "Metadata currently out of sync for " + mPackageName);

                    Log.d(TAG, "  └ Current queueItem: " + currItem);

                    Log.d(TAG, "  └ Current metadata : " + getMetadata().getDescription());

                    Log.d(TAG, "  └ Current queueItem: " + qitem);

                    Log.d(TAG, "  └ Current metadata : " + mdata);

                }

                return false;

            }
@@ -324,10 +324,11 @@ class MediaPlayerWrapper { 
            }



            Log.e(TAG, "Timeout while waiting for metadata to sync for " + mPackageName);

            Log.e(TAG, "  └ Current Metadata: " + getMetadata().getDescription());

            Log.e(TAG, "  └ Current Metadata: " +  Util.toMetadata(getMetadata()));

            Log.e(TAG, "  └ Current Playstate: " + getPlaybackState());

            for (int i = 0; getQueue() != null && i < getQueue().size(); i++) {

                Log.e(TAG, "  └ QueueItem(" + i + "): " + getQueue().get(i));

            List<Metadata> current_queue = Util.toMetadataList(getQueue());

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

                Log.e(TAG, "  └ QueueItem(" + i + "): " + current_queue.get(i));

            }



            sendMediaUpdate();
@@ -387,7 +388,7 @@ class MediaPlayerWrapper { 
                return;

            }



            Log.v(TAG, "onMetadataChanged(): " + mPackageName + " : " + metadata.getDescription());

            Log.v(TAG, "onMetadataChanged(): " + mPackageName + " : " + Util.toMetadata(metadata));



            if (!Objects.equals(metadata, getMetadata())) {

                e("The callback metadata doesn't match controller metadata");
@@ -462,7 +463,7 @@ class MediaPlayerWrapper { 


            if (DEBUG) {

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

                    Log.d(TAG, "  └ QueueItem(" + i + "): " + queue.get(i));

                    Log.d(TAG, "  └ QueueItem(" + i + "): " + current_queue.get(i));

                }

            }

android/app/src/com/android/bluetooth/newavrcp/helpers/Metadata.java

+3 −1
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ class Metadata implements Cloneable { 
    @Override

    public String toString() {

        return "{ mediaId=\"" + mediaId + "\" title=\"" + title + "\" artist=\"" + artist

                + "\" album=\"" + album + "\" }";

                + "\" album=\"" + album + "\" duration=" + duration

                + " trackPosition=" + trackNum + "/" + numTracks + " }";



    }

}