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

Commit 5b3a9112 authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge "Compare image handles with equals() and not ==" am: b6c98b30 am: 339be7fd 

Change-Id: Ie96f6ad14e7c3e09faeece53db95e07baae10722
parents b9c38189 339be7fd

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpPlayer.java

+3 −1
Original line number Diff line number Diff line
@@ -187,8 +187,10 @@ class AvrcpPlayer { 


    public synchronized boolean notifyImageDownload(String handle, Uri imageUri) {

        if (DBG) Log.d(TAG, "Got an image download -- handle=" + handle + ", uri=" + imageUri);

        if (mCurrentTrack != null && mCurrentTrack.getCoverArtHandle() == handle) {

        if (handle == null || imageUri == null || mCurrentTrack == null) return false;

        if (handle.equals(mCurrentTrack.getCoverArtHandle())) {

            mCurrentTrack.setCoverArtLocation(imageUri);

            if (DBG) Log.d(TAG, "Handle '" + handle + "' was added to current track.");

            return true;

        }

        return false;