Use this error code to indicate an expired authentication when {@linkplain + * LibraryResult#ofError(int, LibraryParams) creating a library result} for an unsuccessful + * service call. + * + * @see PlaybackStateCompat#ERROR_CODE_AUTHENTICATION_EXPIRED + */ + public static final int ERROR_CODE_AUTHENTICATION_EXPIRED_COMPAT = 3; + + /** + * The extras key for the localized error resolution string. + * + *
Use this key to populate the extras bundle of the {@link LibraryParams} when {@linkplain + * LibraryResult#ofError(int, LibraryParams) creating a library result} for an unsuccessful + * service call. + */ + public static final String EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL_COMPAT = + androidx.media.utils.MediaConstants.PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL; + + /** + * The extras key for the error resolution intent. + * + *
Use this key to populate the extras bundle of the {@link LibraryParams} when {@linkplain + * LibraryResult#ofError(int, LibraryParams) creating a library result} for an unsuccessful + * service call. + */ + public static final String EXTRAS_KEY_ERROR_RESOLUTION_ACTION_INTENT_COMPAT = + androidx.media.utils.MediaConstants.PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_ACTION_INTENT; + + /** + * {@link Bundle} key used to store a {@link PendingIntent}. When launched, the {@link + * PendingIntent} should allow users to resolve the current playback state error. + * + *
Applications must also set the error message and {@link + * #EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL_COMPAT} for cases in which the intent cannot be auto + * launched. + * + *
Use this key to populate the extras bundle of the {@link LibraryParams} when {@linkplain + * LibraryResult#ofError(int, LibraryParams) creating a library result} for an unsuccessful + * service call. Must be inserted {@linkplain Bundle#putParcelable(String, Parcelable) into the + * bundle as a parcelable}. + * + *
TYPE: {@link PendingIntent}. + */ + @UnstableApi + public static final String EXTRAS_KEY_ERROR_RESOLUTION_USING_CAR_APP_LIBRARY_INTENT_COMPAT = + androidx.media.utils.MediaConstants + .PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_USING_CAR_APP_LIBRARY_INTENT; + + /** + * {@link Bundle} key to indicate a preference that a region of space for the skip to next control + * should always be blocked out in the UI, even when the seek to next standard action is not + * supported. * *
This may be used when the session temporarily disallows {@link * androidx.media3.common.Player#COMMAND_SEEK_TO_NEXT} by design. @@ -39,12 +98,12 @@ public final class MediaConstants { * @see androidx.media3.common.Player#COMMAND_SEEK_TO_NEXT_MEDIA_ITEM */ public static final String EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT = - "android.media.playback.ALWAYS_RESERVE_SPACE_FOR.ACTION_SKIP_TO_NEXT"; + androidx.media.utils.MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_NEXT; /** - * Bundle key to indicate a preference that a region of space for the skip to previous control - * should always be blocked out in the UI, even when the seek to previous standard action is not - * supported. + * {@link Bundle} key to indicate a preference that a region of space for the skip to previous + * control should always be blocked out in the UI, even when the seek to previous standard action + * is not supported. * *
This may be used when the session temporarily disallows {@link * androidx.media3.common.Player#COMMAND_SEEK_TO_PREVIOUS} by design. @@ -57,43 +116,309 @@ public final class MediaConstants { * @see androidx.media3.common.Player#COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM */ public static final String EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV = - "android.media.playback.ALWAYS_RESERVE_SPACE_FOR.ACTION_SKIP_TO_PREVIOUS"; + androidx.media.utils.MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_PREV; /** - * The extras key for the localized error resolution string. + * {@link Bundle} key used in {@link MediaMetadata#extras} to indicate the playback completion + * status of the corresponding {@link MediaItem}. * - *
Use this key to populate the extras bundle of the {@link LibraryParams} when {@link - * LibraryResult#ofError(int, LibraryParams) creating a LibraryResult} for an unsuccessful service - * call. + *
TYPE: int. Possible values are separate constants. * - * @see - * androidx.media.utils.MediaConstants#PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_VALUE_COMPLETION_STATUS_NOT_PLAYED + * @see #EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED + * @see #EXTRAS_VALUE_COMPLETION_STATUS_FULLY_PLAYED */ - public static final String EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL_COMPAT = - "android.media.extras.ERROR_RESOLUTION_ACTION_LABEL"; - /** - * The extras key for the error resolution intent. - * - *
Use this key to populate the extras bundle of the {@link LibraryParams} when {@link - * LibraryResult#ofError(int, LibraryParams) creating a LibraryResult} for an unsuccessful service - * call. - * - * @see - * androidx.media.utils.MediaConstants#PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_ACTION_INTENT - */ - public static final String EXTRAS_KEY_ERROR_RESOLUTION_ACTION_INTENT_COMPAT = - "android.media.extras.ERROR_RESOLUTION_ACTION_INTENT"; + @UnstableApi + public static final String EXTRAS_KEY_COMPLETION_STATUS = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS; /** - * The legacy error code for expired authentication. + * {@link Bundle} value used in {@link MediaMetadata#extras} to indicate that the corresponding + * {@link MediaItem} has not been played by the user. * - *
Use this error code to indicate an expired authentication when {@link - * LibraryResult#ofError(int, LibraryParams) creating a LibraryResult} for an unsuccessful service - * call. - * - * @see PlaybackStateCompat#ERROR_CODE_AUTHENTICATION_EXPIRED + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_KEY_COMPLETION_STATUS */ - public static final int ERROR_CODE_AUTHENTICATION_EXPIRED_COMPAT = 3; + @UnstableApi + public static final int EXTRAS_VALUE_COMPLETION_STATUS_NOT_PLAYED = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_NOT_PLAYED; + + /** + * {@link Bundle} value used in {@link MediaMetadata#extras} to indicate that the corresponding + * {@link MediaItem} has been partially played by the user. + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_KEY_COMPLETION_STATUS + */ + @UnstableApi + public static final int EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED = + androidx.media.utils.MediaConstants + .DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED; + + /** + * {@link Bundle} value used in {@link MediaMetadata#extras} to indicate that the corresponding + * {@link MediaItem} has been fully played by the user. + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_KEY_COMPLETION_STATUS + */ + @UnstableApi + public static final int EXTRAS_VALUE_COMPLETION_STATUS_FULLY_PLAYED = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_FULLY_PLAYED; + + /** + * {@link Bundle} key used in {@link MediaMetadata#extras} to indicate an amount of completion + * progress for the corresponding {@link MediaItem}. This extra augments {@link + * #EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED the partially played status} by indicating how + * much has been played by the user. + * + *
TYPE: double, a value between 0.0 and 1.0, inclusive. 0.0 indicates no completion progress + * (item is not started) and 1.0 indicates full completion progress (item is fully played). Values + * in between indicate partial progress (for example, 0.75 indicates the item is 75% complete). + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + */ + @UnstableApi + public static final String EXTRAS_KEY_COMPLETION_PERCENTAGE = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_PERCENTAGE; + + /** + * {@link Bundle} key used to indicate a preference about how playable instances of {@link + * MediaItem} are presented. + * + *
If exposed through {@link LibraryParams#extras} of the {@link LibraryResult} returned by + * {@link MediaBrowser#getLibraryRoot}, the preference applies to all playable items within the + * browse tree. + * + *
If exposed through {@link MediaMetadata#extras} of a {@linkplain MediaMetadata#folderType + * browsable media item}, the preference applies to only the immediate playable children. It takes + * precedence over preferences received with {@link MediaBrowser#getLibraryRoot}. + * + *
TYPE: int. Possible values are separate constants. + * + * @see MediaBrowser#getLibraryRoot(LibraryParams) + * @see LibraryResult#params + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_VALUE_CONTENT_STYLE_LIST_ITEM + * @see #EXTRAS_VALUE_CONTENT_STYLE_GRID_ITEM + */ + @UnstableApi + public static final String EXTRAS_KEY_CONTENT_STYLE_PLAYABLE = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_PLAYABLE; + + /** + * {@link Bundle} key used to indicate a preference about how browsable instances of {@link + * MediaItem} are presented. + * + *
If exposed through {@link LibraryParams#extras} of the {@link LibraryResult} returned by + * {@link MediaBrowser#getLibraryRoot}, the preference applies to all browsable items within the + * browse tree. + * + *
If exposed through {@link MediaMetadata#extras} of a {@linkplain MediaMetadata#folderType + * browsable media item}, the preference applies to only the immediate browsable children. It + * takes precedence over preferences received with {@link + * MediaBrowser#getLibraryRoot(LibraryParams)}. + * + *
TYPE: int. Possible values are separate constants. + * + * @see MediaBrowser#getLibraryRoot(LibraryParams) + * @see LibraryResult#params + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_VALUE_CONTENT_STYLE_LIST_ITEM + * @see #EXTRAS_VALUE_CONTENT_STYLE_GRID_ITEM + * @see #EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_LIST_ITEM + * @see #EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_GRID_ITEM + */ + @UnstableApi + public static final String EXTRAS_KEY_CONTENT_STYLE_BROWSABLE = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_BROWSABLE; + + /** + * {@link Bundle} key used in {@link MediaMetadata#extras} to indicate a preference about how the + * corresponding {@link MediaItem} is presented. + * + *
This preference takes precedence over those expressed by {@link + * #EXTRAS_KEY_CONTENT_STYLE_PLAYABLE} and {@link #EXTRAS_KEY_CONTENT_STYLE_BROWSABLE}. + * + *
TYPE: int. Possible values are separate constants. + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_VALUE_CONTENT_STYLE_LIST_ITEM + * @see #EXTRAS_VALUE_CONTENT_STYLE_GRID_ITEM + * @see #EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_LIST_ITEM + * @see #EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_GRID_ITEM + */ + @UnstableApi + public static final String EXTRAS_KEY_CONTENT_STYLE_SINGLE_ITEM = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_SINGLE_ITEM; + + /** + * {@link Bundle} value used in {@link MediaMetadata#extras} to indicate a preference that certain + * instances of {@link MediaItem} should be presented as list items. + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_KEY_CONTENT_STYLE_BROWSABLE + * @see #EXTRAS_KEY_CONTENT_STYLE_PLAYABLE + */ + @UnstableApi + public static final int EXTRAS_VALUE_CONTENT_STYLE_LIST_ITEM = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_VALUE_CONTENT_STYLE_LIST_ITEM; + + /** + * {@link Bundle} value used in {@link MediaMetadata#extras} to indicate a preference that certain + * instances of {@link MediaItem} should be presented as grid items. + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_KEY_CONTENT_STYLE_BROWSABLE + * @see #EXTRAS_KEY_CONTENT_STYLE_PLAYABLE + */ + @UnstableApi + public static final int EXTRAS_VALUE_CONTENT_STYLE_GRID_ITEM = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_VALUE_CONTENT_STYLE_GRID_ITEM; + + /** + * {@link Bundle} value used in {@link MediaMetadata#extras} to indicate a preference that + * browsable instances of {@link MediaItem} should be presented as "category" list items. This + * means the items provide icons that render well when they do not fill all of + * the available area. + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_KEY_CONTENT_STYLE_BROWSABLE + */ + @UnstableApi + public static final int EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_LIST_ITEM = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_LIST_ITEM; + + /** + * {@link Bundle} value used in {@link MediaMetadata#extras} to indicate a preference that + * browsable instances of {@link MediaItem} should be presented as "category" grid items. This + * means the items provide icons that render well when they do not fill all of + * the available area. + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + * @see #EXTRAS_KEY_CONTENT_STYLE_BROWSABLE + */ + @UnstableApi + public static final int EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_GRID_ITEM = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_GRID_ITEM; + + /** + * {@link Bundle} key used in {@link MediaMetadata#extras} to indicate that certain instances of + * {@link MediaItem} are related as a group, with a title that is specified through the bundle + * value. Items that are children of the same browsable node and have the same title are members + * of the same group. An app may present a group's items as a contiguous block and display the + * title alongside the group. + * + *
TYPE: String. Should be human readable and localized. + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + */ + @UnstableApi + public static final String EXTRAS_KEY_CONTENT_STYLE_GROUP_TITLE = + androidx.media.utils.MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_GROUP_TITLE; + + /** + * {@link Bundle} key used in {@link MediaMetadata#extras} to indicate that the corresponding + * {@link MediaItem} has explicit content (that is, user discretion is advised when viewing or + * listening to this content). + * + *
TYPE: long (to enable, use value {@link #EXTRAS_VALUE_ATTRIBUTE_PRESENT}) + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + */ + @UnstableApi public static final String EXTRAS_KEY_IS_EXPLICIT = "android.media.IS_EXPLICIT"; + + /** + * {@link Bundle} key used in {@link MediaMetadata#extras} to indicate that the corresponding + * {@link MediaItem} is an advertisement. + * + *
TYPE: long (to enable, use value {@link #EXTRAS_VALUE_ATTRIBUTE_PRESENT}) + * + * @see MediaMetadata.Builder#setExtras(Bundle) + * @see MediaMetadata#extras + */ + @UnstableApi + public static final String EXTRAS_KEY_IS_ADVERTISEMENT = + androidx.media.utils.MediaConstants.METADATA_KEY_IS_ADVERTISEMENT; + + /** + * {@link Bundle} value used to indicate the presence of an attribute described by its + * corresponding key. + */ + @UnstableApi public static final long EXTRAS_VALUE_ATTRIBUTE_PRESENT = 1L; + + /** + * {@link Bundle} key used in {@link LibraryParams#extras} passed to {@link + * MediaLibrarySession.Callback#onGetLibraryRoot(MediaLibrarySession, MediaSession.ControllerInfo, + * LibraryParams)} to indicate the maximum number of children of the root node that can be + * supported by the {@link MediaBrowser}. Excess root children may be omitted or made less + * discoverable. + * + *
TYPE: int + * + * @see MediaLibrarySession.Callback#onGetLibraryRoot(MediaLibrarySession, + * MediaSession.ControllerInfo, LibraryParams) + * @see LibraryParams#extras + */ + @UnstableApi + public static final String EXTRAS_KEY_ROOT_CHILDREN_LIMIT = + androidx.media.utils.MediaConstants.BROWSER_ROOT_HINTS_KEY_ROOT_CHILDREN_LIMIT; + + /** + * {@link Bundle} key used in {@link LibraryParams#extras} passed by the {@link MediaBrowser} as + * root hints to {@link MediaLibrarySession.Callback#onGetLibraryRoot(MediaLibrarySession, + * MediaSession.ControllerInfo, LibraryParams)} to indicate the recommended size, in pixels, for + * media art bitmaps. Much smaller images may not render well, and much larger images may cause + * inefficient resource consumption. + * + * @see MediaBrowser#getLibraryRoot(LibraryParams) + * @see MediaLibrarySession.Callback#onGetLibraryRoot(MediaLibrarySession, + * MediaSession.ControllerInfo, LibraryParams) + * @see LibraryParams#extras + */ + @UnstableApi + public static final String EXTRAS_KEY_MEDIA_ART_SIZE_PIXELS = + androidx.media.utils.MediaConstants.BROWSER_ROOT_HINTS_KEY_MEDIA_ART_SIZE_PIXELS; + + /** + * {@link Bundle} key used to indicate that the media app that provides the service supports + * showing a settings page. + * + *
Use this key to populate the {@link LibraryParams#extras} of the {@link LibraryResult} + * returned by {@link MediaLibrarySession.Callback#onGetLibraryRoot(MediaLibrarySession, + * MediaSession.ControllerInfo, LibraryParams)}. Use this key with {@link + * Bundle#putParcelable(String, Parcelable)} to put a {@link PendingIntent} that is created using + * {@code CarPendingIntent#getCarApp()}. + * + *
The {@link Intent} carried by the pending intent needs to have the component name set to a + * Car App Library + * service that needs to exist in the same application package as the media browser service. + * + *
TYPE: {@link PendingIntent}.
+ *
+ * @see MediaLibrarySession.Callback#onGetLibraryRoot(MediaLibrarySession,
+ * MediaSession.ControllerInfo, LibraryParams)
+ * @see LibraryParams#extras
+ */
+ @UnstableApi
+ public static final String EXTRAS_KEY_APPLICATION_PREFERENCES_USING_CAR_APP_LIBRARY_INTENT =
+ androidx.media.utils.MediaConstants
+ .BROWSER_SERVICE_EXTRAS_KEY_APPLICATION_PREFERENCES_USING_CAR_APP_LIBRARY_INTENT;
/* package */ static final String SESSION_COMMAND_ON_CAPTIONING_ENABLED_CHANGED =
"androidx.media3.session.SESSION_COMMAND_ON_CAPTIONING_ENABLED_CHANGED";
diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserConstants.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserConstants.java
index 99138d683d..65e7847199 100644
--- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserConstants.java
+++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserConstants.java
@@ -26,6 +26,8 @@ public class MediaBrowserConstants {
public static final String ROOT_ID = "rootId";
public static final Bundle ROOT_EXTRAS = new Bundle();
+ public static final String ROOT_EXTRAS_KEY = "root_extras_key";
+ public static final int ROOT_EXTRAS_VALUE = 4321;
public static final String MEDIA_ID_GET_BROWSABLE_ITEM = "media_id_get_browsable_item";
public static final String MEDIA_ID_GET_PLAYABLE_ITEM = "media_id_get_playable_item";
@@ -71,7 +73,7 @@ public class MediaBrowserConstants {
public static final String CUSTOM_ACTION_ASSERT_PARAMS = "assertParams";
static {
- ROOT_EXTRAS.putString(ROOT_ID, ROOT_ID);
+ ROOT_EXTRAS.putInt(ROOT_EXTRAS_KEY, ROOT_EXTRAS_VALUE);
CUSTOM_ACTION_EXTRAS.putString(CUSTOM_ACTION, CUSTOM_ACTION);
diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserServiceCompatConstants.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserServiceCompatConstants.java
index 698e996aaf..f864078f07 100644
--- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserServiceCompatConstants.java
+++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserServiceCompatConstants.java
@@ -24,6 +24,8 @@ public class MediaBrowserServiceCompatConstants {
public static final String TEST_CONNECT_REJECTED = "testConnect_rejected";
public static final String TEST_ON_CHILDREN_CHANGED_SUBSCRIBE_AND_UNSUBSCRIBE =
"testOnChildrenChanged_subscribeAndUnsubscribe";
+ public static final String TEST_GET_LIBRARY_ROOT = "getLibraryRoot_correctExtraKeyAndValue";
+ public static final String TEST_GET_CHILDREN = "getChildren_correctMetadataExtras";
private MediaBrowserServiceCompatConstants() {}
}
diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserCompatWithMediaLibraryServiceTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserCompatWithMediaLibraryServiceTest.java
index aadc857a3c..e6b31bd549 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserCompatWithMediaLibraryServiceTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserCompatWithMediaLibraryServiceTest.java
@@ -15,6 +15,8 @@
*/
package androidx.media3.session;
+import static androidx.media3.session.MediaConstants.EXTRAS_KEY_COMPLETION_STATUS;
+import static androidx.media3.session.MediaConstants.EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED;
import static androidx.media3.test.session.common.CommonConstants.METADATA_ARTWORK_URI;
import static androidx.media3.test.session.common.CommonConstants.METADATA_DESCRIPTION;
import static androidx.media3.test.session.common.CommonConstants.METADATA_EXTRA_KEY;
@@ -38,6 +40,8 @@ import static androidx.media3.test.session.common.MediaBrowserConstants.PARENT_I
import static androidx.media3.test.session.common.MediaBrowserConstants.PARENT_ID_LONG_LIST;
import static androidx.media3.test.session.common.MediaBrowserConstants.PARENT_ID_NO_CHILDREN;
import static androidx.media3.test.session.common.MediaBrowserConstants.ROOT_EXTRAS;
+import static androidx.media3.test.session.common.MediaBrowserConstants.ROOT_EXTRAS_KEY;
+import static androidx.media3.test.session.common.MediaBrowserConstants.ROOT_EXTRAS_VALUE;
import static androidx.media3.test.session.common.MediaBrowserConstants.ROOT_ID;
import static androidx.media3.test.session.common.MediaBrowserConstants.SEARCH_QUERY;
import static androidx.media3.test.session.common.MediaBrowserConstants.SEARCH_QUERY_EMPTY_RESULT;
@@ -67,6 +71,7 @@ import androidx.media3.test.session.common.TestUtils;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.ext.truth.os.BundleSubject;
import androidx.test.filters.LargeTest;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
@@ -96,6 +101,11 @@ public class MediaBrowserCompatWithMediaLibraryServiceTest
});
connectAndWait();
assertThat(browserCompat.getRoot()).isEqualTo(ROOT_ID);
+ assertThat(
+ browserCompat
+ .getExtras()
+ .getInt(ROOT_EXTRAS_KEY, /* defaultValue= */ ROOT_EXTRAS_VALUE + 1))
+ .isEqualTo(ROOT_EXTRAS_VALUE);
// Note: Cannot use equals() here because browser compat's extra contains server version,
// extra binder, and extra messenger.
@@ -202,22 +212,18 @@ public class MediaBrowserCompatWithMediaLibraryServiceTest
@Test
public void getChildren() throws InterruptedException {
String testParentId = PARENT_ID;
-
connectAndWait();
CountDownLatch latch = new CountDownLatch(1);
+ List