From 62ed45b5051a4ff13e56195ec72d2b6370dacd32 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Thu, 1 Sep 2022 16:08:00 +0000
Subject: [PATCH] Use ContextCompat.getMainExecutor when calling MediaBrowser
 methods

Replacing remaining usage of MoreExecutors.directExecutor. 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: 471547177
(cherry picked from commit 9a6745431a285a4403e66aa4227f6fc1d118ba75)
---
 .../main/java/androidx/media3/demo/session/MainActivity.kt   | 5 ++---
 .../androidx/media3/demo/session/PlayableFolderActivity.kt   | 3 +--
 2 files changed, 3 insertions(+), 5 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 9abfd65056..0e7694dc03 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
@@ -34,7 +34,6 @@ import androidx.media3.session.MediaBrowser
 import androidx.media3.session.SessionToken
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.common.util.concurrent.ListenableFuture
-import com.google.common.util.concurrent.MoreExecutors
 
 class MainActivity : AppCompatActivity() {
   private lateinit var browserFuture: ListenableFuture<MediaBrowser>
@@ -105,7 +104,7 @@ class MainActivity : AppCompatActivity() {
           SessionToken(this, ComponentName(this, PlaybackService::class.java))
         )
         .buildAsync()
-    browserFuture.addListener({ pushRoot() }, MoreExecutors.directExecutor())
+    browserFuture.addListener({ pushRoot() }, ContextCompat.getMainExecutor(this))
   }
 
   private fun releaseBrowser() {
@@ -132,7 +131,7 @@ class MainActivity : AppCompatActivity() {
         subItemMediaList.addAll(children)
         mediaListAdapter.notifyDataSetChanged()
       },
-      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 125b0e0b8a..f92bb3367f 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
@@ -38,7 +38,6 @@ import com.google.android.material.floatingactionbutton.ExtendedFloatingActionBu
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import com.google.common.util.concurrent.ListenableFuture
-import com.google.common.util.concurrent.MoreExecutors
 
 class PlayableFolderActivity : AppCompatActivity() {
   private lateinit var browserFuture: ListenableFuture<MediaBrowser>
@@ -132,7 +131,7 @@ class PlayableFolderActivity : AppCompatActivity() {
           SessionToken(this, ComponentName(this, PlaybackService::class.java))
         )
         .buildAsync()
-    browserFuture.addListener({ displayFolder() }, MoreExecutors.directExecutor())
+    browserFuture.addListener({ displayFolder() }, ContextCompat.getMainExecutor(this))
   }
 
   private fun releaseBrowser() {