From c9abe70259adabd1523b0e2aa0a4df74d78339d9 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 1 Jul 2022 13:53:11 +0000
Subject: [PATCH] Use ContextCompat.getMainExecutor when calling MediaBrowser
 methods

This allows the service to be switched to run in another process and the app still works the same as if it is running in the same process.

Issue: androidx/media#100
PiperOrigin-RevId: 458460005
---
 .../main/java/androidx/media3/demo/session/MainActivity.kt   | 3 ++-
 .../androidx/media3/demo/session/PlayableFolderActivity.kt   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt
index be7c324e36..9abfd65056 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt
@@ -27,6 +27,7 @@ import android.widget.ArrayAdapter
 import android.widget.ListView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.media3.common.MediaItem
 import androidx.media3.session.LibraryResult
 import androidx.media3.session.MediaBrowser
@@ -164,7 +165,7 @@ class MainActivity : AppCompatActivity() {
         val root: MediaItem = result.value!!
         pushPathStack(root)
       },
-      MoreExecutors.directExecutor()
+      ContextCompat.getMainExecutor(this)
     )
   }
 
diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
index f1c1631d45..125b0e0b8a 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
@@ -29,6 +29,7 @@ import android.widget.LinearLayout
 import android.widget.ListView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import androidx.media3.session.MediaBrowser
@@ -150,7 +151,7 @@ class PlayableFolderActivity : AppCompatActivity() {
         val result = mediaItemFuture.get()!!
         title.text = result.value!!.mediaMetadata.title
       },
-      MoreExecutors.directExecutor()
+      ContextCompat.getMainExecutor(this)
     )
     childrenFuture.addListener(
       {
@@ -161,7 +162,7 @@ class PlayableFolderActivity : AppCompatActivity() {
         subItemMediaList.addAll(children)
         mediaListAdapter.notifyDataSetChanged()
       },
-      MoreExecutors.directExecutor()
+      ContextCompat.getMainExecutor(this)
     )
   }