From 0f6f425ff8ca0648c8cf12711365ba961843a913 Mon Sep 17 00:00:00 2001 From: Jay Sebastian Date: Thu, 3 Oct 2019 15:22:54 -0700 Subject: Enable AA for multiple browse services Add extra to enable AA to work with a media session in a package with multiple browse services. Test: manually with AAP Change-Id: Ibd84c51cba7890bff9a70ba73cacb9782334a416 --- .../src/com/android/car/media/testmediaapp/TmaBrowser.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java') diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java index 02e8292..e6c8e02 100644 --- a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java +++ b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java @@ -53,6 +53,11 @@ public class TmaBrowser extends MediaBrowserServiceCompat { private static final String MEDIA_SESSION_TAG = "TEST_MEDIA_SESSION"; private static final String ROOT_ID = "_ROOT_ID_"; private static final String SEARCH_SUPPORTED = "android.media.browse.SEARCH_SUPPORTED"; + /** + * Extras key to allow Android Auto to identify the browse service from the media session. + */ + private static final String BROWSE_SERVICE_FOR_SESSION_KEY = + "android.media.session.BROWSE_SERVICE"; private TmaPrefs mPrefs; private Handler mHandler; @@ -78,6 +83,9 @@ public class TmaBrowser extends MediaBrowserServiceCompat { mSession.setCallback(mPlayer); mSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS); + Bundle mediaSessionExtras = new Bundle(); + mediaSessionExtras.putString(BROWSE_SERVICE_FOR_SESSION_KEY, TmaBrowser.class.getName()); + mSession.setExtras(mediaSessionExtras); mPrefs.mAccountType.registerChangeListener( (oldValue, newValue) -> onAccountChanged(newValue)); @@ -88,9 +96,9 @@ public class TmaBrowser extends MediaBrowserServiceCompat { mPrefs.mRootReplyDelay.registerChangeListener( (oldValue, newValue) -> invalidateRoot()); - Bundle extras = new Bundle(); - extras.putBoolean(SEARCH_SUPPORTED, true); - mRoot = new BrowserRoot(ROOT_ID, extras); + Bundle browserRootExtras = new Bundle(); + browserRootExtras.putBoolean(SEARCH_SUPPORTED, true); + mRoot = new BrowserRoot(ROOT_ID, browserRootExtras); } @Override -- cgit v1.2.3