Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tomasz Wasilczyk
2018-04-20 13:49:39 +00:00
committed by Android (Google) Code Review
parent 8788cffd05 71791f95c6
commit a2015451a7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/radio/ProgramSelector.java
View File

@@ -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) {