loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix value type when unbundling LibraryResult without expected type

Browse Source 
Calling LibraryResult.toBundle() could have caused a CastClassException.
This was because when unbundled with UNKNOWN_TYPE_CREATOR.fromBundle(Bundle),
the valueType was set to VALUE_TYPE_ITEM_LIST for all types and the MediaItem
was attempted to be casted to a list.

PiperOrigin-RevId: 529717688
(cherry picked from commit f28a5888091c5caa685117d7a6653ae6c5a29f26)
This commit is contained in:
bachinger 2023-05-05 15:01:58 +00:00 committed by Ian Baker
parent 13191edd90
commit 3064bc9b37
2 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/session/src/main/java/androidx/media3/session/LibraryResult.java
View File

@ -388,7 +388,7 @@ public final class LibraryResult<V> implements Bundleable {
throw new IllegalStateException();
}
return new LibraryResult<>(resultCode, completionTimeMs, params, value, VALUE_TYPE_ITEM_LIST);
return new LibraryResult<>(resultCode, completionTimeMs, params, value, valueType);
}
@Documented

76
libraries/session/src/test/java/androidx/media3/session/LibraryResultTest.java
View File

@ -15,11 +15,17 @@
*/
package androidx.media3.session;
import static androidx.media3.session.LibraryResult.RESULT_ERROR_NOT_SUPPORTED;
import static androidx.media3.session.LibraryResult.UNKNOWN_TYPE_CREATOR;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;
import android.os.Bundle;
import androidx.media3.common.MediaItem;
import androidx.media3.common.MediaMetadata;
import androidx.media3.session.MediaLibraryService.LibraryParams;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -51,4 +57,74 @@ public class LibraryResultTest {
assertThrows(
IllegalArgumentException.class, () -> LibraryResult.ofItem(item, /* params= */ null));
}
@Test
public void toBundle_mediaItemLibraryResultThatWasUnbundledAsAnUnknownType_noException() {
MediaItem mediaItem =
new MediaItem.Builder()
.setMediaId("rootMediaId")
.setMediaMetadata(
new MediaMetadata.Builder().setIsPlayable(false).setIsBrowsable(true).build())
.build();
LibraryParams params = new LibraryParams.Builder().build();
LibraryResult<MediaItem> libraryResult = LibraryResult.ofItem(mediaItem, params);
Bundle libraryResultBundle = libraryResult.toBundle();
LibraryResult<?> libraryResultFromUntyped =
UNKNOWN_TYPE_CREATOR.fromBundle(libraryResultBundle);
Bundle bundleOfUntyped = libraryResultFromUntyped.toBundle();
assertThat(UNKNOWN_TYPE_CREATOR.fromBundle(bundleOfUntyped).value).isEqualTo(mediaItem);
}
@Test
public void toBundle_mediaItemListLibraryResultThatWasUnbundledAsAnUnknownType_noException() {
MediaItem mediaItem =
new MediaItem.Builder()
.setMediaId("rootMediaId")
.setMediaMetadata(
new MediaMetadata.Builder().setIsPlayable(false).setIsBrowsable(true).build())
.build();
LibraryParams params = new LibraryParams.Builder().build();
LibraryResult<ImmutableList<MediaItem>> libraryResult =
LibraryResult.ofItemList(ImmutableList.of(mediaItem), params);
Bundle libraryResultBundle = libraryResult.toBundle();
LibraryResult<?> mediaItemLibraryResultFromUntyped =
UNKNOWN_TYPE_CREATOR.fromBundle(libraryResultBundle);
Bundle bundleOfUntyped = mediaItemLibraryResultFromUntyped.toBundle();
assertThat(UNKNOWN_TYPE_CREATOR.fromBundle(bundleOfUntyped).value)
.isEqualTo(ImmutableList.of(mediaItem));
}
@Test
public void toBundle_errorResultThatWasUnbundledAsAnUnknownType_noException() {
LibraryResult<ImmutableList<Error>> libraryResult =
LibraryResult.ofError(LibraryResult.RESULT_ERROR_NOT_SUPPORTED);
Bundle errorLibraryResultBundle = libraryResult.toBundle();
LibraryResult<?> libraryResultFromUntyped =
UNKNOWN_TYPE_CREATOR.fromBundle(errorLibraryResultBundle);
Bundle bundleOfUntyped = libraryResultFromUntyped.toBundle();
assertThat(UNKNOWN_TYPE_CREATOR.fromBundle(bundleOfUntyped).value).isNull();
assertThat(UNKNOWN_TYPE_CREATOR.fromBundle(bundleOfUntyped).resultCode)
.isEqualTo(RESULT_ERROR_NOT_SUPPORTED);
}
@Test
public void toBundle_voidResultThatWasUnbundledAsAnUnknownType_noException() {
LibraryResult<ImmutableList<Error>> libraryResult =
LibraryResult.ofError(LibraryResult.RESULT_ERROR_NOT_SUPPORTED);
Bundle errorLibraryResultBundle = libraryResult.toBundle();
LibraryResult<?> libraryResultFromUntyped =
UNKNOWN_TYPE_CREATOR.fromBundle(errorLibraryResultBundle);
Bundle bundleOfUntyped = libraryResultFromUntyped.toBundle();
assertThat(UNKNOWN_TYPE_CREATOR.fromBundle(bundleOfUntyped).value).isNull();
assertThat(UNKNOWN_TYPE_CREATOR.fromBundle(bundleOfUntyped).resultCode)
.isEqualTo(RESULT_ERROR_NOT_SUPPORTED);
}
}