loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-03 21:57:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Two minor nullability fixes

Browse Source 
PiperOrigin-RevId: 283810554
This commit is contained in:
olly 2019-12-04 20:29:56 +00:00 committed by Oliver Woodman
parent 9f44e902b1
commit cab05cb71d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
View File

@ -41,7 +41,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.checkerframework.checker.nullness.compatqual.NullableType;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf; import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.RequiresNonNull; import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@ -122,8 +121,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@Nullable private RequestHandler requestHandler; @Nullable private RequestHandler requestHandler;
@Nullable private T mediaCrypto; @Nullable private T mediaCrypto;
@Nullable private DrmSessionException lastException; @Nullable private DrmSessionException lastException;
private byte @NullableType [] sessionId; @Nullable private byte[] sessionId;
private byte @MonotonicNonNull [] offlineLicenseKeySetId; @MonotonicNonNull private byte[] offlineLicenseKeySetId;
@Nullable private KeyRequest currentKeyRequest; @Nullable private KeyRequest currentKeyRequest;
@Nullable private ProvisionRequest currentProvisionRequest; @Nullable private ProvisionRequest currentProvisionRequest;
@ -148,6 +147,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
* @param loadErrorHandlingPolicy The {@link LoadErrorHandlingPolicy} for key and provisioning * @param loadErrorHandlingPolicy The {@link LoadErrorHandlingPolicy} for key and provisioning
* requests. * requests.
*/ */
// the constructor does not initialize fields: sessionId
@SuppressWarnings("nullness:initialization.fields.uninitialized")
public DefaultDrmSession( public DefaultDrmSession(
UUID uuid, UUID uuid,
ExoMediaDrm<T> mediaDrm, ExoMediaDrm<T> mediaDrm,

2
library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java
View File

@ -15,9 +15,9 @@
*/ */
package com.google.android.exoplayer2.extractor; package com.google.android.exoplayer2.extractor;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import org.checkerframework.checker.nullness.qual.Nullable;
/** /**
* An MPEG audio frame header. * An MPEG audio frame header.