diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java index 10fda5099a..cce784d0f5 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java @@ -15,8 +15,6 @@ */ package androidx.media3.exoplayer.drm; -import static androidx.media3.common.util.Assertions.checkNotNull; - import android.annotation.SuppressLint; import android.media.DeniedByServerException; import android.media.MediaCrypto; @@ -25,7 +23,6 @@ import android.media.MediaDrm; import android.media.MediaDrmException; import android.media.NotProvisionedException; import android.media.UnsupportedSchemeException; -import android.media.metrics.LogSessionId; import android.os.PersistableBundle; import android.text.TextUtils; import androidx.annotation.DoNotInline; @@ -191,9 +188,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm { @Override public void setPlayerIdForSession(byte[] sessionId, PlayerId playerId) { - if (Util.SDK_INT >= 31) { - Api31.setLogSessionIdOnMediaDrmSession(mediaDrm, sessionId, playerId); - } + // TODO(b/221032172): Implement this when CDM compatibility issues are resolved. } // Return values of MediaDrm.KeyRequest.getRequestType are equal to KeyRequest.RequestType. @@ -523,16 +518,5 @@ public final class FrameworkMediaDrm implements ExoMediaDrm { public static boolean requiresSecureDecoder(MediaDrm mediaDrm, String mimeType) { return mediaDrm.requiresSecureDecoder(mimeType); } - - @DoNotInline - public static void setLogSessionIdOnMediaDrmSession( - MediaDrm mediaDrm, byte[] drmSessionId, PlayerId playerId) { - LogSessionId logSessionId = playerId.getLogSessionId(); - if (!logSessionId.equals(LogSessionId.LOG_SESSION_ID_NONE)) { - MediaDrm.PlaybackComponent playbackComponent = - checkNotNull(mediaDrm.getPlaybackComponent(drmSessionId)); - playbackComponent.setLogSessionId(logSessionId); - } - } } }