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 b20ec27ab2..99138d683d 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 @@ -30,7 +30,6 @@ public class MediaBrowserConstants { 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"; public static final String MEDIA_ID_GET_ITEM_WITH_METADATA = "media_id_get_item_with_metadata"; - public static final String MEDIA_ID_GET_NULL_ITEM = "media_id_get_null_item"; public static final String PARENT_ID = "parent_id"; public static final String PARENT_ID_LONG_LIST = "parent_id_long_list"; diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserListenerTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserListenerTest.java index 607e54473f..efac881994 100644 --- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserListenerTest.java +++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserListenerTest.java @@ -45,7 +45,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; import com.google.common.collect.ImmutableList; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.junit.Before; @@ -144,30 +143,6 @@ public class MediaBrowserListenerTest extends MediaControllerListenerTest { assertThat(result.value).isNull(); } - @Test - public void getItem_nullResult() throws Exception { - String mediaId = MediaBrowserConstants.MEDIA_ID_GET_NULL_ITEM; - - // Exception will be thrown in the service side, and the process will be crashed. - // In that case one of following will happen - // Case 1) Process is crashed. Pending ListenableFuture will get error - // Case 2) Due to the frequent crashes with other tests, process may not crash immediately - // because the Android shows dialog 'xxx keeps stopping' and defer sending - // SIG_KILL until the user's explicit action. - try { - MediaBrowser browser = createBrowser(); - LibraryResult result = - threadTestRule - .getHandler() - .postAndSync(() -> browser.getItem(mediaId)) - .get(TIMEOUT_MS, MILLISECONDS); - // Case 1. - assertThat(result.resultCode).isNotEqualTo(RESULT_SUCCESS); - } catch (TimeoutException e) { - // Case 2. - } - } - @Test public void getChildren() throws Exception { String parentId = MediaBrowserConstants.PARENT_ID; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaLibraryService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaLibraryService.java index f6360454e9..982e557cfe 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaLibraryService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaLibraryService.java @@ -27,7 +27,6 @@ import static androidx.media3.test.session.common.MediaBrowserConstants.GET_CHIL import static androidx.media3.test.session.common.MediaBrowserConstants.LONG_LIST_COUNT; import static androidx.media3.test.session.common.MediaBrowserConstants.MEDIA_ID_GET_BROWSABLE_ITEM; import static androidx.media3.test.session.common.MediaBrowserConstants.MEDIA_ID_GET_ITEM_WITH_METADATA; -import static androidx.media3.test.session.common.MediaBrowserConstants.MEDIA_ID_GET_NULL_ITEM; import static androidx.media3.test.session.common.MediaBrowserConstants.MEDIA_ID_GET_PLAYABLE_ITEM; import static androidx.media3.test.session.common.MediaBrowserConstants.NOTIFY_CHILDREN_CHANGED_EXTRAS; import static androidx.media3.test.session.common.MediaBrowserConstants.NOTIFY_CHILDREN_CHANGED_ITEM_COUNT; @@ -208,11 +207,6 @@ public class MockMediaLibraryService extends MediaLibraryService { case MEDIA_ID_GET_ITEM_WITH_METADATA: return Futures.immediateFuture( LibraryResult.ofItem(createMediaItemWithMetadata(mediaId), /* params= */ null)); - case MEDIA_ID_GET_NULL_ITEM: - // Passing item=null here is expected to throw NPE, this is testing a misbehaving app - // that ignores the nullness annotations. - return Futures.immediateFuture( - LibraryResult.ofItem(/* item= */ null, /* params= */ null)); default: // fall out } return Futures.immediateFuture(LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE));