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

Commit f7056b5f authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

Add null check before string comparison 

In some cases, the media metadata can be null, resulting
in a crash. Adding some checks to prevent this.

Bug: 278376610
Tag: #feature
Test: MediaPlayerWrapperTest
Change-Id: I84d545df15e1324a41f9fe334fc9fa1147eec010
parent 4edfc104

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

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ public class MediaPlayerWrapper { 
        // MediaDescription is usually compared via its title, artist and album.

        if (mediaPlayingMetadata != null) {

            for (Metadata metadata : mCurrentData.queue) {

                if (metadata.title == null || metadata.artist == null || metadata.album == null) {

                    // if one of the informations is missing we can't assume it is the same media.

                    continue;

                }

                if (metadata.title.equals(mediaPlayingMetadata.title)

                        && metadata.artist.equals(mediaPlayingMetadata.artist)

                        && metadata.album.equals(mediaPlayingMetadata.album)) {