From 718cf1299b805339b605bf268fce0ad9158c44f5 Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Tue, 6 Feb 2024 03:43:48 -0800
Subject: [PATCH] Fix Kotlin 2.0 compilation error in session demo app

Since Kotlin 2.0 the compiler became better at detecting incorrect
annotation applications. The @OptIn annotation can't be applied to an
expression, so when compiling with Kotlin 2.0 it results in an error.

PiperOrigin-RevId: 604596657
---
 .../java/androidx/media3/demo/session/PlayerActivity.kt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
index a87e177b58..aa5c7bc0e8 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
@@ -54,6 +54,7 @@ class PlayerActivity : AppCompatActivity() {
   private val mediaItemList: MutableList<MediaItem> = mutableListOf()
   private var lastMediaItemId: String? = null
 
+  @OptIn(UnstableApi::class) // PlayerView.hideController
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_player)
@@ -67,7 +68,6 @@ class PlayerActivity : AppCompatActivity() {
         val controller = this.controller ?: return@run
         if (controller.currentMediaItemIndex == position) {
           controller.playWhenReady = !controller.playWhenReady
-          @OptIn(UnstableApi::class) // PlayerView.hideController
           if (controller.playWhenReady) {
             playerView.hideController()
           }
@@ -94,7 +94,7 @@ class PlayerActivity : AppCompatActivity() {
     controllerFuture =
       MediaController.Builder(
           this,
-          SessionToken(this, ComponentName(this, PlaybackService::class.java))
+          SessionToken(this, ComponentName(this, PlaybackService::class.java)),
         )
         .buildAsync()
     updateMediaMetadataUI()
@@ -163,7 +163,7 @@ class PlayerActivity : AppCompatActivity() {
   private inner class MediaItemListAdapter(
     context: Context,
     viewID: Int,
-    mediaItemList: List<MediaItem>
+    mediaItemList: List<MediaItem>,
   ) : ArrayAdapter<MediaItem>(context, viewID, mediaItemList) {
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
       val mediaItem = getItem(position)!!