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

Commit 9c37eae3 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by android-build-merger
Browse files

Merge "Don't check program selector's type for equality." into pi-dev am: a2015451 

am: 74a2955d

Change-Id: I2bcfc30020e0ee9bdee8e38dc124c9ea49df5ceb
parents 63223c14 74a2955d

core/java/android/hardware/radio/ProgramSelector.java

+3 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ public final class ProgramSelector implements Parcelable { 
    @Override

    public int hashCode() {

        // secondaryIds and vendorIds are ignored for equality/hashing

        return Objects.hash(mProgramType, mPrimaryId);

        return mPrimaryId.hashCode();

    }



    @Override
@@ -507,7 +507,8 @@ public final class ProgramSelector implements Parcelable { 
        if (!(obj instanceof ProgramSelector)) return false;

        ProgramSelector other = (ProgramSelector) obj;

        // secondaryIds and vendorIds are ignored for equality/hashing

        return other.getProgramType() == mProgramType && mPrimaryId.equals(other.getPrimaryId());

        // programType can be inferred from primaryId, thus not checked

        return mPrimaryId.equals(other.getPrimaryId());

    }



    private ProgramSelector(Parcel in) {