loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-07 15:40:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix all FIXME comments.

Browse Source 
These are mostly nullability issues.

PiperOrigin-RevId: 253537068
This commit is contained in:
tonihei 2019-06-17 09:56:50 +01:00 committed by Oliver Woodman
parent feefaacb31
commit 18f1b06a68
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View File

@ -544,7 +544,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
@Override @Override
public void onEvent( public void onEvent(
ExoMediaDrm<? extends T> md, ExoMediaDrm<? extends T> md,
byte[] sessionId, @Nullable byte[] sessionId,
int event, int event,
int extra, int extra,
@Nullable byte[] data) { @Nullable byte[] data) {

3
library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
View File

@ -80,7 +80,7 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
*/ */
void onEvent( void onEvent(
ExoMediaDrm<? extends T> mediaDrm, ExoMediaDrm<? extends T> mediaDrm,
byte[] sessionId, @Nullable byte[] sessionId,
int event, int event,
int extra, int extra,
@Nullable byte[] data); @Nullable byte[] data);
@ -215,6 +215,7 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
throws NotProvisionedException; throws NotProvisionedException;
/** @see MediaDrm#provideKeyResponse(byte[], byte[]) */ /** @see MediaDrm#provideKeyResponse(byte[], byte[]) */
@Nullable
byte[] provideKeyResponse(byte[] scope, byte[] response) byte[] provideKeyResponse(byte[] scope, byte[] response)
throws NotProvisionedException, DeniedByServerException; throws NotProvisionedException, DeniedByServerException;

5
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
View File

@ -84,8 +84,6 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
} }
} }
// FIXME: incompatible types in argument.
@SuppressWarnings("nullness:argument.type.incompatible")
@Override @Override
public void setOnEventListener( public void setOnEventListener(
final ExoMediaDrm.OnEventListener<? super FrameworkMediaCrypto> listener) { final ExoMediaDrm.OnEventListener<? super FrameworkMediaCrypto> listener) {
@ -160,8 +158,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
return new KeyRequest(requestData, licenseServerUrl); return new KeyRequest(requestData, licenseServerUrl);
} }
// FIXME: incompatible types in return. @Nullable
@SuppressWarnings("nullness:return.type.incompatible")
@Override @Override
public byte[] provideKeyResponse(byte[] scope, byte[] response) public byte[] provideKeyResponse(byte[] scope, byte[] response)
throws NotProvisionedException, DeniedByServerException { throws NotProvisionedException, DeniedByServerException {

6
library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
View File

@ -25,6 +25,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import androidx.annotation.RequiresPermission; import androidx.annotation.RequiresPermission;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
@ -129,9 +130,8 @@ public final class PlatformScheduler implements Scheduler {
logd("Requirements are met"); logd("Requirements are met");
String serviceAction = extras.getString(KEY_SERVICE_ACTION); String serviceAction = extras.getString(KEY_SERVICE_ACTION);
String servicePackage = extras.getString(KEY_SERVICE_PACKAGE); String servicePackage = extras.getString(KEY_SERVICE_PACKAGE);
// FIXME: incompatible types in argument. Intent intent =
@SuppressWarnings("nullness:argument.type.incompatible") new Intent(Assertions.checkNotNull(serviceAction)).setPackage(servicePackage);
Intent intent = new Intent(serviceAction).setPackage(servicePackage);
logd("Starting service action: " + serviceAction + " package: " + servicePackage); logd("Starting service action: " + serviceAction + " package: " + servicePackage);
Util.startForegroundService(this, intent); Util.startForegroundService(this, intent);
} else { } else {