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

Commit cea5c4bc authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Prevent NPE from null metadata in GPM 

am: 2fe3a700

Change-Id: I5697088f1491613a2265a4230ff668e2b2c48684
parents 1a2631cc 2fe3a700

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

+5 −1
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ class GPMWrapper extends MediaPlayerWrapper { 


    @Override

    boolean isMetadataSynced() {

        if (getQueue() == null) {

            return false;

        }



        // Check if currentPlayingQueueId is in the queue

        MediaSession.QueueItem currItem = null;

        for (MediaSession.QueueItem item : getQueue()) {
@@ -47,7 +51,7 @@ class GPMWrapper extends MediaPlayerWrapper { 
            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().getDescription());

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

            }

            return false;

        }