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

Commit b3b5c54e authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Make Metadata.equals() faster" am: 38e4d5c2 am: d93091a7 

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



Change-Id: I3d0a965c863b69d46cd88edc8839679b3db2a4e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 046de2e2 d93091a7

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

+4 −2
Original line number Diff line number Diff line
@@ -57,19 +57,21 @@ public class Metadata implements Cloneable { 
        if (!(o instanceof Metadata)) return false;



        final Metadata m = (Metadata) o;

        if (!Objects.equals(mediaId, m.mediaId)) return false;

        if (!Objects.equals(title, m.title)) return false;

        if (!Objects.equals(artist, m.artist)) return false;

        if (!Objects.equals(album, m.album)) return false;

        if (!Objects.equals(trackNum, m.trackNum)) return false;

        if (!Objects.equals(numTracks, m.numTracks)) return false;

        if (!Image.sameAs(image, m.image)) return false;

        if (!Objects.equals(genre, m.genre)) return false;

        if (!Objects.equals(duration, m.duration)) return false;

        return true;

    }



    @Override

    public int hashCode() {

        // Do not hash the Image as it does not implement hashCode

        return Objects.hash(title, artist, album, trackNum, numTracks, image);

        return Objects.hash(mediaId, title, artist, album, trackNum, numTracks, genre, duration);

    }



    @Override