From 4b26eb28000581d2ce9d367cedc1cc6c5e73640c Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Tue, 17 Dec 2024 05:50:10 -0800
Subject: [PATCH] Fix lint errors

- Add required mutability flag to `ConnectionStateTest` to fix
  `Missing PendingIntent mutability flag`.
- Suppress `WrongConstant` lint error caused by Kotlin's spread operator
  not propagating the `@IntDef` annotation.

#cherrypick

PiperOrigin-RevId: 707061163
---
 .../java/androidx/media3/session/ConnectionStateTest.java   | 6 +++++-
 .../java/androidx/media3/ui/compose/utils/TestPlayer.kt     | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/session/src/test/java/androidx/media3/session/ConnectionStateTest.java b/libraries/session/src/test/java/androidx/media3/session/ConnectionStateTest.java
index 356dd4c515..36a6515ede 100644
--- a/libraries/session/src/test/java/androidx/media3/session/ConnectionStateTest.java
+++ b/libraries/session/src/test/java/androidx/media3/session/ConnectionStateTest.java
@@ -23,6 +23,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import androidx.media3.common.MediaLibraryInfo;
 import androidx.media3.common.Player;
+import androidx.media3.common.util.Util;
 import androidx.media3.test.utils.TestExoPlayerBuilder;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -49,7 +50,10 @@ public class ConnectionStateTest {
             MediaSessionStub.VERSION_INT,
             new MediaSessionStub(session.getImpl()),
             /* sessionActivity= */ PendingIntent.getActivity(
-                context, /* requestCode= */ 0, new Intent(), /* flags= */ 0),
+                context,
+                /* requestCode= */ 0,
+                new Intent(),
+                /* flags= */ Util.SDK_INT >= 23 ? PendingIntent.FLAG_IMMUTABLE : 0),
             /* customLayout= */ ImmutableList.of(
                 new CommandButton.Builder(CommandButton.ICON_ARTIST)
                     .setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
diff --git a/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/utils/TestPlayer.kt b/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/utils/TestPlayer.kt
index 58ed179a26..65e80a0dff 100644
--- a/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/utils/TestPlayer.kt
+++ b/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/utils/TestPlayer.kt
@@ -116,6 +116,9 @@ internal class TestPlayer : SimpleBasePlayer(Looper.myLooper()!!) {
   }
 
   fun addCommands(vararg commands: @Player.Command Int) {
+    // It doesn't seem possible to propagate the @IntDef annotation through Kotlin's spread operator
+    // in a way that lint understands.
+    @SuppressWarnings("WrongConstant")
     state =
       state
         .buildUpon()