Commit 0a27d7b4 by olly Committed by Oliver Woodman

Don't use DRM prior to API level 18

PiperOrigin-RevId: 278660557
parent 87003b30
...@@ -50,6 +50,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray; ...@@ -50,6 +50,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.ui.PlayerControlView; import com.google.android.exoplayer2.ui.PlayerControlView;
import com.google.android.exoplayer2.ui.PlayerView; import com.google.android.exoplayer2.ui.PlayerView;
import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory; import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
import com.google.android.exoplayer2.util.Util;
import com.google.android.gms.cast.MediaQueueItem; import com.google.android.gms.cast.MediaQueueItem;
import com.google.android.gms.cast.framework.CastContext; import com.google.android.gms.cast.framework.CastContext;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -408,7 +409,7 @@ import java.util.Map; ...@@ -408,7 +409,7 @@ import java.util.Map;
DrmSessionManager<ExoMediaCrypto> drmSessionManager = DrmSessionManager<ExoMediaCrypto> drmSessionManager =
DrmSessionManager.getDummyDrmSessionManager(); DrmSessionManager.getDummyDrmSessionManager();
MediaItem.DrmConfiguration drmConfiguration = item.drmConfiguration; MediaItem.DrmConfiguration drmConfiguration = item.drmConfiguration;
if (drmConfiguration != null) { if (drmConfiguration != null && Util.SDK_INT >= 18) {
String licenseServerUrl = String licenseServerUrl =
drmConfiguration.licenseUri != null ? drmConfiguration.licenseUri.toString() : ""; drmConfiguration.licenseUri != null ? drmConfiguration.licenseUri.toString() : "";
HttpMediaDrmCallback drmCallback = HttpMediaDrmCallback drmCallback =
......
...@@ -15,12 +15,14 @@ ...@@ -15,12 +15,14 @@
*/ */
package com.google.android.exoplayer2.drm; package com.google.android.exoplayer2.drm;
import android.annotation.TargetApi;
import android.media.MediaDrm; import android.media.MediaDrm;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.util.Pair; import android.util.Pair;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.DefaultDrmSessionManager.Mode; import com.google.android.exoplayer2.drm.DefaultDrmSessionManager.Mode;
import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException; import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException;
...@@ -30,9 +32,9 @@ import com.google.android.exoplayer2.util.Assertions; ...@@ -30,9 +32,9 @@ import com.google.android.exoplayer2.util.Assertions;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID; import java.util.UUID;
/** /** Helper class to download, renew and release offline licenses. */
* Helper class to download, renew and release offline licenses. @TargetApi(18)
*/ @RequiresApi(18)
public final class OfflineLicenseHelper<T extends ExoMediaCrypto> { public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
private static final DrmInitData DUMMY_DRM_INIT_DATA = new DrmInitData(); private static final DrmInitData DUMMY_DRM_INIT_DATA = new DrmInitData();
......
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