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

Commit 74a2955d 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

Change-Id: Id2bf66e26c54a2a8cc86b408b240d6984fb5b97b
parents bcf3bd60 a2015451
Loading
Loading
Loading
Loading
+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) {