From 4c54a12af28e952722d2e5ae274f77d1a04a4654 Mon Sep 17 00:00:00 2001
From: Tatsuya Fujisaki <1838962+tatsuyafujisaki@users.noreply.github.com>
Date: Mon, 1 May 2023 23:53:35 +0900
Subject: [PATCH] Simplify loadJSONFromAsset()

---
 .../java/androidx/media3/demo/session/MediaItemTree.kt    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/demos/session/src/main/java/androidx/media3/demo/session/MediaItemTree.kt b/demos/session/src/main/java/androidx/media3/demo/session/MediaItemTree.kt
index a1a6c6c187..1795f72c27 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/MediaItemTree.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/MediaItemTree.kt
@@ -20,9 +20,9 @@ import android.net.Uri
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaItem.SubtitleConfiguration
 import androidx.media3.common.MediaMetadata
-import androidx.media3.common.util.Util
 import com.google.common.collect.ImmutableList
 import org.json.JSONObject
+import java.io.BufferedReader
 
 /**
  * A sample media catalog that represents media items as a tree.
@@ -91,10 +91,8 @@ object MediaItemTree {
       .build()
   }
 
-  private fun loadJSONFromAsset(assets: AssetManager): String {
-    val buffer = assets.open("catalog.json").use { Util.toByteArray(it) }
-    return String(buffer, Charsets.UTF_8)
-  }
+  private fun loadJSONFromAsset(assets: AssetManager): String =
+    assets.open("catalog.json").bufferedReader().use(BufferedReader::readText)
 
   fun initialize(assets: AssetManager) {
     if (isInitialized) return