From 4b957cce47e0a7eab92f4f02635a31c5110984bd Mon Sep 17 00:00:00 2001 From: eguven Date: Wed, 18 Jan 2017 09:28:17 -0800 Subject: [PATCH] Fix streaming license renew error When the first streaming license request response provided to mediaDrm it might return an empty array instead of null. This was set to offlineLicenseKeySetId which made the work like there is a valid offline license. Simplified the code and made it to set offlineLicenseKeySetId only if there is sensible data in keySetId. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=144843144 --- .../android/exoplayer2/drm/DefaultDrmSessionManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java index 6eb70428d5..9c959a38c5 100644 --- a/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java @@ -564,9 +564,7 @@ public class DefaultDrmSessionManager implements DrmSe } } else { byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, (byte[]) response); - if (offlineLicenseKeySetId != null && (keySetId == null || keySetId.length == 0)) { - // This means that the keySetId is unchanged. - } else { + if (keySetId != null && keySetId.length != 0) { offlineLicenseKeySetId = keySetId; } state = STATE_OPENED_WITH_KEYS;