Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
1266d596
authored
Jun 17, 2019
by
tonihei
Committed by
Oliver Woodman
Jun 18, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix all FIXME comments.
These are mostly nullability issues. PiperOrigin-RevId: 253537068
parent
da1f3f01
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
9 deletions
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View file @
1266d596
...
...
@@ -533,7 +533,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
@Override
public
void
onEvent
(
ExoMediaDrm
<?
extends
T
>
md
,
byte
[]
sessionId
,
@Nullable
byte
[]
sessionId
,
int
event
,
int
extra
,
@Nullable
byte
[]
data
)
{
...
...
library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
View file @
1266d596
...
...
@@ -80,7 +80,7 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
*/
void
onEvent
(
ExoMediaDrm
<?
extends
T
>
mediaDrm
,
byte
[]
sessionId
,
@Nullable
byte
[]
sessionId
,
int
event
,
int
extra
,
@Nullable
byte
[]
data
);
...
...
@@ -215,6 +215,7 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
throws
NotProvisionedException
;
/** @see MediaDrm#provideKeyResponse(byte[], byte[]) */
@Nullable
byte
[]
provideKeyResponse
(
byte
[]
scope
,
byte
[]
response
)
throws
NotProvisionedException
,
DeniedByServerException
;
...
...
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
View file @
1266d596
...
...
@@ -84,8 +84,6 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
}
}
// FIXME: incompatible types in argument.
@SuppressWarnings
(
"nullness:argument.type.incompatible"
)
@Override
public
void
setOnEventListener
(
final
ExoMediaDrm
.
OnEventListener
<?
super
FrameworkMediaCrypto
>
listener
)
{
...
...
@@ -160,8 +158,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
return
new
KeyRequest
(
requestData
,
licenseServerUrl
);
}
// FIXME: incompatible types in return.
@SuppressWarnings
(
"nullness:return.type.incompatible"
)
@Nullable
@Override
public
byte
[]
provideKeyResponse
(
byte
[]
scope
,
byte
[]
response
)
throws
NotProvisionedException
,
DeniedByServerException
{
...
...
library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
View file @
1266d596
...
...
@@ -25,6 +25,7 @@ import android.content.Context;
import
android.content.Intent
;
import
android.os.PersistableBundle
;
import
androidx.annotation.RequiresPermission
;
import
com.google.android.exoplayer2.util.Assertions
;
import
com.google.android.exoplayer2.util.Log
;
import
com.google.android.exoplayer2.util.Util
;
...
...
@@ -129,9 +130,8 @@ public final class PlatformScheduler implements Scheduler {
logd
(
"Requirements are met"
);
String
serviceAction
=
extras
.
getString
(
KEY_SERVICE_ACTION
);
String
servicePackage
=
extras
.
getString
(
KEY_SERVICE_PACKAGE
);
// FIXME: incompatible types in argument.
@SuppressWarnings
(
"nullness:argument.type.incompatible"
)
Intent
intent
=
new
Intent
(
serviceAction
).
setPackage
(
servicePackage
);
Intent
intent
=
new
Intent
(
Assertions
.
checkNotNull
(
serviceAction
)).
setPackage
(
servicePackage
);
logd
(
"Starting service action: "
+
serviceAction
+
" package: "
+
servicePackage
);
Util
.
startForegroundService
(
this
,
intent
);
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment