From eb3173aa90a4e7d9438f46ef21a6696ddc0d0129 Mon Sep 17 00:00:00 2001 From: jbibik Date: Fri, 26 Jan 2024 11:31:33 -0800 Subject: [PATCH] Remove a redundant TODO in Util PiperOrigin-RevId: 601820851 --- .../src/main/java/androidx/media3/common/util/Util.java | 5 ++--- .../src/test/java/androidx/media3/common/util/UtilTest.java | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java index a22a32ac2e..3dbce4668a 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java @@ -3338,11 +3338,10 @@ public final class Util { *

For example: android.media.MediaCodec.error_1 or android.media.MediaDrm.error_neg_2. * * @param diagnosticsInfo A string from which to parse the error code. - * @return The parser error code, or 0 if an error code could not be parsed. + * @return The parsed error code, or 0 if an error code could not be parsed. */ @UnstableApi public static int getErrorCodeFromPlatformDiagnosticsInfo(@Nullable String diagnosticsInfo) { - // TODO (internal b/192337376): Change 0 for ERROR_UNKNOWN once available. if (diagnosticsInfo == null) { return 0; } @@ -3354,7 +3353,7 @@ public final class Util { String digitsSection = strings[length - 1]; boolean isNegative = length >= 3 && "neg".equals(strings[length - 2]); try { - int errorCode = Integer.parseInt(Assertions.checkNotNull(digitsSection)); + int errorCode = Integer.parseInt(checkNotNull(digitsSection)); return isNegative ? -errorCode : errorCode; } catch (NumberFormatException e) { return 0; diff --git a/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java b/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java index 5faa7b4389..965c681ca3 100644 --- a/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java +++ b/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java @@ -1258,7 +1258,6 @@ public class UtilTest { @Test public void getErrorCodeFromPlatformDiagnosticsInfo_withInvalidInput_returnsZero() { - // TODO (internal b/192337376): Change 0 for ERROR_UNKNOWN once available. assertThat(Util.getErrorCodeFromPlatformDiagnosticsInfo("")).isEqualTo(0); assertThat(Util.getErrorCodeFromPlatformDiagnosticsInfo("android.media.MediaDrm.empty")) .isEqualTo(0);