sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FlagSet.equals on API levels below 24

Browse source 
#minor-release

PiperOrigin-RevId: 395004645
This commit is contained in:
gyumin 2021-09-06 01:37:11 +01:00 committed by Ian Baker
parent 9991f14643
commit 00dda049ea
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASENOTES.md
View file

@ -13,6 +13,7 @@
`ForwardingPlayer`. `ForwardingPlayer`.
* Remove `ExoPlayerLibraryInfo.GL_ASSERTIONS_ENABLED`. Use * Remove `ExoPlayerLibraryInfo.GL_ASSERTIONS_ENABLED`. Use
`GlUtil.glAssertionsEnabled` instead. `GlUtil.glAssertionsEnabled` instead.
* Fix `FlagSet#equals` on API levels below 24.
* Extractors: * Extractors:
* Support TS packets without PTS flag * Support TS packets without PTS flag
([#9294](https://github.com/google/ExoPlayer/issues/9294)). ([#9294](https://github.com/google/ExoPlayer/issues/9294)).

22
library/common/src/main/java/com/google/android/exoplayer2/util/FlagSet.java
View file

@ -211,11 +211,33 @@ public final class FlagSet {
return false; return false;
} }
FlagSet that = (FlagSet) o; FlagSet that = (FlagSet) o;
if (Util.SDK_INT < 24) {
// SparseBooleanArray.equals() is not implemented on API levels below 24.
if (size() != that.size()) {
return false;
}
for (int i = 0; i < size(); i++) {
if (get(i) != that.get(i)) {
return false;
}
}
return true;
} else {
return flags.equals(that.flags); return flags.equals(that.flags);
} }
}
@Override @Override
public int hashCode() { public int hashCode() {
if (Util.SDK_INT < 24) {
// SparseBooleanArray.hashCode() is not implemented on API levels below 24.
int hashCode = size();
for (int i = 0; i < size(); i++) {
hashCode = 31 * hashCode + get(i);
}
return hashCode;
} else {
return flags.hashCode(); return flags.hashCode();
} }
} }
}