From 1c855a8abf0c0a7f246c1cbee819fedc4c731231 Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 22 Apr 2025 06:47:06 -0700 Subject: [PATCH] Remove unneeded SDK checks PiperOrigin-RevId: 750172684 --- .../media3/exoplayer/analytics/MediaMetricsListener.java | 3 +-- .../androidx/media3/session/legacy/LegacyParcelableUtil.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java index 32f23bb302..67dc6669ba 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java @@ -15,7 +15,6 @@ */ package androidx.media3.exoplayer.analytics; -import static android.os.Build.VERSION.SDK_INT; import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Util.castNonNull; @@ -765,7 +764,7 @@ public final class MediaMetricsListener int subErrorCode = Util.getErrorCodeFromPlatformDiagnosticsInfo(diagnosticsInfo); int errorCode = getDrmErrorCode(subErrorCode); return new ErrorInfo(errorCode, subErrorCode); - } else if (SDK_INT >= 23 && cause instanceof MediaDrmResetException) { + } else if (cause instanceof MediaDrmResetException) { return new ErrorInfo(PlaybackErrorEvent.ERROR_DRM_SYSTEM_ERROR, /* subErrorCode= */ 0); } else if (cause instanceof NotProvisionedException) { return new ErrorInfo( diff --git a/libraries/session/src/main/java/androidx/media3/session/legacy/LegacyParcelableUtil.java b/libraries/session/src/main/java/androidx/media3/session/legacy/LegacyParcelableUtil.java index 48974dac7d..584b915b7d 100644 --- a/libraries/session/src/main/java/androidx/media3/session/legacy/LegacyParcelableUtil.java +++ b/libraries/session/src/main/java/androidx/media3/session/legacy/LegacyParcelableUtil.java @@ -88,7 +88,7 @@ public final class LegacyParcelableUtil { // TODO: b/335804969 - Remove this workaround once the bug fix is in the androidx.media dependency @SuppressWarnings("unchecked") private static T maybeApplyMediaDescriptionParcelableBugWorkaround(T value) { - if (SDK_INT < 21 || SDK_INT >= 23) { + if (SDK_INT >= 23) { return value; } if (value instanceof android.support.v4.media.MediaBrowserCompat.MediaItem) {