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

Commit a2015451 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

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

parents 8788cffd 71791f95
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) {