Commit 5afc915e by ibaker Committed by Oliver Woodman

Don't restore DRM keys before releasing them

#minor-release

PiperOrigin-RevId: 375436117
parent 8d550bf0
......@@ -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)
......
......@@ -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;
......
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