Skip to content

SDK / exoplayer

Go to a project
Commit 60630fe9 by olly Committed by kim-vde
Options

Upgrade some null checks to assertions 

PiperOrigin-RevId: 325226353
parent 38dd1bb7
Inline Side-by-side
Showing with 3 additions and 3 deletions
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
......@@ -306,7 +306,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm {
boolean canConcatenateData = true;
for (int i = 0; i < schemeDatas.size(); i++) {
SchemeData schemeData = schemeDatas.get(i);
byte[] schemeDataData = Util.castNonNull(schemeData.data);
byte[] schemeDataData = Assertions.checkNotNull(schemeData.data);
if (Util.areEqual(schemeData.mimeType, firstSchemeData.mimeType)
&& Util.areEqual(schemeData.licenseServerUrl, firstSchemeData.licenseServerUrl)
&& PsshAtomUtil.isPsshAtom(schemeDataData)) {
......@@ -321,7 +321,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm {
int concatenatedDataPosition = 0;
for (int i = 0; i < schemeDatas.size(); i++) {
SchemeData schemeData = schemeDatas.get(i);
byte[] schemeDataData = Util.castNonNull(schemeData.data);
byte[] schemeDataData = Assertions.checkNotNull(schemeData.data);
int schemeDataLength = schemeDataData.length;
System.arraycopy(
schemeDataData, 0, concatenatedData, concatenatedDataPosition, schemeDataLength);
......@@ -335,7 +335,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm {
// the first V0 box.
for (int i = 0; i < schemeDatas.size(); i++) {
SchemeData schemeData = schemeDatas.get(i);
int version = PsshAtomUtil.parseVersion(Util.castNonNull(schemeData.data));
int version = PsshAtomUtil.parseVersion(Assertions.checkNotNull(schemeData.data));
if (Util.SDK_INT < 23 && version == 0) {
return schemeData;
} else if (Util.SDK_INT >= 23 && version == 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment