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
5afc915e
authored
May 24, 2021
by
ibaker
Committed by
Oliver Woodman
May 26, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Don't restore DRM keys before releasing them
#minor-release PiperOrigin-RevId: 375436117
parent
8d550bf0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
RELEASENOTES.md
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
RELEASENOTES.md
View file @
5afc915e
...
...
@@ -57,6 +57,9 @@
*
PlayerNotificationManager:
*
Add
`PendingIntent.FLAG_IMMUTABLE`
flag to BroadcastReceiver to support
Android 12.
*
DRM:
*
Don't restore offline keys before releasing them. In OEMCrypto v16+ keys
must be released without restoring them first.
### 2.14.0 (2021-05-13)
...
...
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
View file @
5afc915e
...
...
@@ -430,11 +430,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
case
DefaultDrmSessionManager
.
MODE_RELEASE
:
Assertions
.
checkNotNull
(
offlineLicenseKeySetId
);
Assertions
.
checkNotNull
(
this
.
sessionId
);
// It's not necessary to restore the key before releasing it but this serves as a good
// fast-failure check.
if
(
restoreKeys
())
{
postKeyRequest
(
offlineLicenseKeySetId
,
ExoMediaDrm
.
KEY_TYPE_RELEASE
,
allowRetry
);
}
postKeyRequest
(
offlineLicenseKeySetId
,
ExoMediaDrm
.
KEY_TYPE_RELEASE
,
allowRetry
);
break
;
default
:
break
;
...
...
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