Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix typo contail->contain" am: 49dcfea031

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824553

Change-Id: Ia965a1c5aaa32b55bcf1548ae1eba0470745ca33
This commit is contained in:
Treehugger Robot
2021-09-11 05:16:58 +00:00
committed by Automerger Merge Worker
parent 59622faba3 49dcfea031
commit 17da84da54
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/MediaMetadataRetriever.java
View File

@@ -928,7 +928,7 @@ public class MediaMetadataRetriever implements AutoCloseable {
private @NonNull List<Bitmap> getFramesAtIndexInternal( private @NonNull List<Bitmap> getFramesAtIndexInternal(
int frameIndex, int numFrames, @Nullable BitmapParams params) { int frameIndex, int numFrames, @Nullable BitmapParams params) {
if (!"yes".equals(extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO))) { if (!"yes".equals(extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO))) {
throw new IllegalStateException("Does not contail video or image sequences"); throw new IllegalStateException("Does not contain video or image sequences");
} }
int frameCount = Integer.parseInt( int frameCount = Integer.parseInt(
extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_FRAME_COUNT)); extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_FRAME_COUNT));
@@ -1046,7 +1046,7 @@ public class MediaMetadataRetriever implements AutoCloseable {
private Bitmap getImageAtIndexInternal(int imageIndex, @Nullable BitmapParams params) { private Bitmap getImageAtIndexInternal(int imageIndex, @Nullable BitmapParams params) {
if (!"yes".equals(extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_IMAGE))) { if (!"yes".equals(extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_IMAGE))) {
throw new IllegalStateException("Does not contail still images"); throw new IllegalStateException("Does not contain still images");
} }
String imageCount = extractMetadata(MediaMetadataRetriever.METADATA_KEY_IMAGE_COUNT); String imageCount = extractMetadata(MediaMetadataRetriever.METADATA_KEY_IMAGE_COUNT);