Post ServiceConnection operations to handler

Test: atest CtsMediaBetterTogetherTestCases CtsMediaHostTestCases
Bug: b/338940163
Flag: com.android.media.flags.enable_mr2_service_non_main_bg_thread
Change-Id: I5d275d889ae94ef1a1ed1c8731e208899c317abe

1 files changed, 15 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
index 31706063eb34..0307d5ea1fc2 100644
--- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
+++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
@@ -539,17 +539,29 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider {
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
-            onServiceConnectedInternal(service);
+            if (Flags.enableMr2ServiceNonMainBgThread()) {
+                mHandler.post(() -> onServiceConnectedInternal(service));
+            } else {
+                onServiceConnectedInternal(service);
+            }
         }
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
-            onServiceDisconnectedInternal();
+            if (Flags.enableMr2ServiceNonMainBgThread()) {
+                mHandler.post(() -> onServiceDisconnectedInternal());
+            } else {
+                onServiceDisconnectedInternal();
+            }
         }
 
         @Override
         public void onBindingDied(ComponentName name) {
-            onBindingDiedInternal(name);
+            if (Flags.enableMr2ServiceNonMainBgThread()) {
+                mHandler.post(() -> onBindingDiedInternal(name));
+            } else {
+                onBindingDiedInternal(name);
+            }
         }
     }