Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_merge

Bug: 172690556
Merged-In: I41ee24f2b16b22fce688ba8e238ac4cff8335f7a
Change-Id: I76dcd53e645f15496c562e1b3218715ad85c4a25

1 files changed, 15 insertions, 7 deletions

diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java b/TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java
index 84f481f..014e81e 100644
--- a/TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java
+++ b/TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java
@@ -52,13 +52,21 @@ public class TmaLauncherActivity extends AppCompatActivity {
                     // Get the token for the MediaSession
                     MediaSessionCompat.Token token = mediaBrowser.getSessionToken();
 
-                    // Create a MediaControllerCompat
-                    MediaControllerCompat controller =
-                            new MediaControllerCompat(TmaLauncherActivity.this, token);
-
-                    // Save the controller
-                    MediaControllerCompat.setMediaController(
-                            TmaLauncherActivity.this, controller);
+                    try {
+                        // Create a MediaControllerCompat
+                        MediaControllerCompat controller =
+                                new MediaControllerCompat(TmaLauncherActivity.this, token);
+                        // Save the controller
+                        MediaControllerCompat.setMediaController(
+                                TmaLauncherActivity.this, controller);
+                    } catch (Exception ex) {
+                        // ToDo: b/166328624 Workaround for an Android Studio Build error:
+                        //          unreported exception RemoteException
+                        //       Whereas as an Android Soong Build error:
+                        //          RemoteException is never thrown
+                        Log.e(TAG, "Failed to create MediaControllerCompat", ex);
+                        return;
+                    }
                 }
             };