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

Commit ebf59cca authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Add null check before string comparison" am: 2893fc93 am: 3bfe1a6d... 

Merge "Add null check before string comparison" am: 2893fc93 am: 3bfe1a6d am: 2d5ff9e2 am: 48031519

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2543692



Change-Id: Ib90d3686da93ddbee805c8fa096637605278e3b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 375c8eb6 48031519

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