From 6377e277c7df0a1e524ca8363647802c46b01d64 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Wed, 29 Jan 2020 11:41:06 +0000 Subject: [PATCH] Move DrmSession into the core module PiperOrigin-RevId: 292112214 --- .../src/main/java/com/google/android/exoplayer2/Format.java | 5 ++--- .../java/com/google/android/exoplayer2/drm/DrmSession.java | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename library/{common => core}/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java (100%) diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Format.java b/library/common/src/main/java/com/google/android/exoplayer2/Format.java index 19ed34405a..b59a50ad34 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/Format.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/Format.java @@ -19,7 +19,6 @@ import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.Nullable; import com.google.android.exoplayer2.drm.DrmInitData; -import com.google.android.exoplayer2.drm.DrmSession; import com.google.android.exoplayer2.drm.ExoMediaCrypto; import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.util.MimeTypes; @@ -163,8 +162,8 @@ public final class Format implements Parcelable { /** * The type of the {@link ExoMediaCrypto} provided by the media source, if the media source can - * acquire a {@link DrmSession} for {@link #drmInitData}. Null if the media source cannot acquire - * a session for {@link #drmInitData}, or if not applicable. + * acquire a DRM session for {@link #drmInitData}. Null if the media source cannot acquire a + * session for {@link #drmInitData}, or if not applicable. */ @Nullable public final Class exoMediaCryptoType; diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java