From e24febf1e2c48977e2422a4c880fffe62cdeb06e Mon Sep 17 00:00:00 2001
From: Ian Baker <ibaker@google.com>
Date: Tue, 13 Feb 2024 14:48:15 +0000
Subject: [PATCH] Small clean-ups and added @InlineMe annotation

---
 .../java/androidx/media3/common/util/TraceUtil.java   | 11 ++++++-----
 .../media3/exoplayer/video/PlaceholderSurface.java    |  4 ++++
 .../java/androidx/media3/ui/CaptionStyleCompat.java   |  1 -
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/util/TraceUtil.java b/libraries/common/src/main/java/androidx/media3/common/util/TraceUtil.java
index 418d110755..d190ae4ee1 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/TraceUtil.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/TraceUtil.java
@@ -15,9 +15,10 @@
  */
 package androidx.media3.common.util;
 
+import android.os.Trace;
 import androidx.media3.common.MediaLibraryInfo;
 
-/** Calls through to {@link android.os.Trace} methods on supported API levels. */
+/** Calls through to {@link Trace} methods if {@link MediaLibraryInfo#TRACE_ENABLED} is {@code true}. */
 @UnstableApi
 public final class TraceUtil {
 
@@ -26,24 +27,24 @@ public final class TraceUtil {
   /**
    * Writes a trace message to indicate that a given section of code has begun.
    *
-   * @see android.os.Trace#beginSection(String)
+   * @see Trace#beginSection(String)
    * @param sectionName The name of the code section to appear in the trace. This may be at most 127
    *     Unicode code units long.
    */
   public static void beginSection(String sectionName) {
     if (MediaLibraryInfo.TRACE_ENABLED) {
-      android.os.Trace.beginSection(sectionName);
+      Trace.beginSection(sectionName);
     }
   }
 
   /**
    * Writes a trace message to indicate that a given section of code has ended.
    *
-   * @see android.os.Trace#endSection()
+   * @see Trace#endSection()
    */
   public static void endSection() {
     if (MediaLibraryInfo.TRACE_ENABLED) {
-      android.os.Trace.endSection();
+      Trace.endSection();
     }
   }
 }
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaceholderSurface.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaceholderSurface.java
index dc46bdd61f..fb133567f4 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaceholderSurface.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaceholderSurface.java
@@ -33,6 +33,7 @@ import androidx.media3.common.util.GlUtil;
 import androidx.media3.common.util.Log;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import com.google.errorprone.annotations.InlineMe;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** A placeholder {@link Surface}. */
@@ -67,6 +68,9 @@ public final class PlaceholderSurface extends Surface {
   /**
    * @deprecated Use {@link #newInstance(Context, boolean)} instead.
    */
+  @InlineMe(
+      replacement = "PlaceholderSurface.newInstance(context, secure)",
+      imports = "androidx.media3.exoplayer.video.PlaceholderSurface")
   @Deprecated
   public static PlaceholderSurface newInstanceV17(Context context, boolean secure) {
     return newInstance(context, secure);
diff --git a/libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java b/libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java
index 04ab0e6647..834e1e4063 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/CaptionStyleCompat.java
@@ -114,7 +114,6 @@ public final class CaptionStyleCompat {
    * @param captionStyle A {@link CaptionStyle}.
    * @return The equivalent {@link CaptionStyleCompat}.
    */
-  @SuppressWarnings("ResourceType") // DO NOT SUBMIT check this is still needed
   public static CaptionStyleCompat createFromCaptionStyle(
       CaptioningManager.CaptionStyle captionStyle) {
     if (Util.SDK_INT >= 21) {