Commit 8970e80b by eguven Committed by Oliver Woodman

Don't use the returned key set id if the request wasn't for an offline license key

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=145533961
parent 0e992370
...@@ -530,9 +530,8 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -530,9 +530,8 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
private void postKeyRequest(byte[] scope, int keyType) { private void postKeyRequest(byte[] scope, int keyType) {
KeyRequest keyRequest;
try { try {
keyRequest = mediaDrm.getKeyRequest(scope, schemeInitData, schemeMimeType, keyType, KeyRequest keyRequest = mediaDrm.getKeyRequest(scope, schemeInitData, schemeMimeType, keyType,
optionalKeyRequestParameters); optionalKeyRequestParameters);
postRequestHandler.obtainMessage(MSG_KEYS, keyRequest).sendToTarget(); postRequestHandler.obtainMessage(MSG_KEYS, keyRequest).sendToTarget();
} catch (Exception e) { } catch (Exception e) {
...@@ -564,7 +563,8 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -564,7 +563,8 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
} else { } else {
byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, (byte[]) response); byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, (byte[]) response);
if (keySetId != null && keySetId.length != 0) { if ((mode == MODE_DOWNLOAD || (mode == MODE_PLAYBACK && offlineLicenseKeySetId != null))
&& keySetId != null && keySetId.length != 0) {
offlineLicenseKeySetId = keySetId; offlineLicenseKeySetId = keySetId;
} }
state = STATE_OPENED_WITH_KEYS; state = STATE_OPENED_WITH_KEYS;
......
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