From 1061135cfd68dec4d2e073c1ca9e08d57b5c6875 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Tue, 16 May 2023 16:34:01 +0100
Subject: [PATCH] Remove deprecated String constants for Charsets

Use Kotlin Charsets from the `kotlin.text` package, the `java.nio.charset.StandardCharsets` or the `com.google.common.base.Charsets` instead.

#minor-release

PiperOrigin-RevId: 532469103
---
 RELEASENOTES.md                               |  5 ++++
 .../main/java/androidx/media3/common/C.java   | 30 -------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 8adbba7966..454de6c58e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -32,6 +32,11 @@
     *   Remove deprecated `DownloadService` constructor, use a non deprecated
         constructor that includes the option to provide a
         `channelDescriptionResourceId` parameter.
+    *   Remove deprecated String constants for Charsets (`ASCII_NAME`,
+        `UTF8_NAME`, `ISO88591_NAME`, `UTF16_NAME` and `UTF16LE_NAME`), use
+        Kotlin Charsets from the `kotlin.text` package, the
+        `java.nio.charset.StandardCharsets` or the
+        `com.google.common.base.Charsets` instead.
 
 ### 1.0.2 (2023-05-18)
 
diff --git a/libraries/common/src/main/java/androidx/media3/common/C.java b/libraries/common/src/main/java/androidx/media3/common/C.java
index f2cfb1ac41..075569f2b8 100644
--- a/libraries/common/src/main/java/androidx/media3/common/C.java
+++ b/libraries/common/src/main/java/androidx/media3/common/C.java
@@ -95,36 +95,6 @@ public final class C {
   /** The number of bytes per float. */
   @UnstableApi public static final int BYTES_PER_FLOAT = 4;
 
-  /**
-   * @deprecated Use {@link java.nio.charset.StandardCharsets} or {@link
-   *     com.google.common.base.Charsets} instead.
-   */
-  @UnstableApi @Deprecated public static final String ASCII_NAME = "US-ASCII";
-
-  /**
-   * @deprecated Use {@link java.nio.charset.StandardCharsets} or {@link
-   *     com.google.common.base.Charsets} instead.
-   */
-  @UnstableApi @Deprecated public static final String UTF8_NAME = "UTF-8";
-
-  /**
-   * @deprecated Use {@link java.nio.charset.StandardCharsets} or {@link
-   *     com.google.common.base.Charsets} instead.
-   */
-  @UnstableApi @Deprecated public static final String ISO88591_NAME = "ISO-8859-1";
-
-  /**
-   * @deprecated Use {@link java.nio.charset.StandardCharsets} or {@link
-   *     com.google.common.base.Charsets} instead.
-   */
-  @UnstableApi @Deprecated public static final String UTF16_NAME = "UTF-16";
-
-  /**
-   * @deprecated Use {@link java.nio.charset.StandardCharsets} or {@link
-   *     com.google.common.base.Charsets} instead.
-   */
-  @UnstableApi @Deprecated public static final String UTF16LE_NAME = "UTF-16LE";
-
   /** The name of the serif font family. */
   @UnstableApi public static final String SERIF_NAME = "serif";