From ea4711630f55d5dafd034985b1f7054f8d721523 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Fri, 17 Jan 2020 14:04:46 +0000 Subject: [PATCH] Fix build --- .../com/google/android/exoplayer2/offline/DownloadService.java | 2 +- .../core/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump | 2 ++ .../core/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump | 2 ++ .../core/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump | 2 ++ .../core/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump | 2 ++ .../android/exoplayer2/extractor/FlacMetadataReaderTest.java | 2 +- 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java index d8a0608825..6377a9e6ff 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java @@ -925,7 +925,7 @@ public abstract class DownloadService extends Service { // DownloadService.getForegroundNotification, and concrete subclass implementations may // not anticipate the possibility of this method being called before their onCreate // implementation has finished executing. - Util.createHandler() + new Handler() .postAtFrontOfQueue( () -> downloadService.notifyDownloads(downloadManager.getCurrentDownloads())); } diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump b/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump index 4bc30a8bef..3b1c90c783 100644 --- a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump +++ b/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump @@ -24,6 +24,7 @@ track 0: selectionFlags = 0 language = null drmInitData = - + metadata = null initializationData: data = length 29, hash 4746B5D9 data = length 10, hash 7A0D0F2B @@ -170,6 +171,7 @@ track 1: selectionFlags = 0 language = und drmInitData = - + metadata = entries=[TSSE: description=null: value=Lavf56.1.0] initializationData: data = length 2, hash 5F7 total output bytes = 9529 diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump b/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump index 3b4906f063..7d8c3c1e5d 100644 --- a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump +++ b/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump @@ -24,6 +24,7 @@ track 0: selectionFlags = 0 language = null drmInitData = - + metadata = null initializationData: data = length 29, hash 4746B5D9 data = length 10, hash 7A0D0F2B @@ -170,6 +171,7 @@ track 1: selectionFlags = 0 language = und drmInitData = - + metadata = entries=[TSSE: description=null: value=Lavf56.1.0] initializationData: data = length 2, hash 5F7 total output bytes = 7464 diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump b/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump index b4db32c20c..a87f1678a4 100644 --- a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump +++ b/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump @@ -24,6 +24,7 @@ track 0: selectionFlags = 0 language = null drmInitData = - + metadata = null initializationData: data = length 29, hash 4746B5D9 data = length 10, hash 7A0D0F2B @@ -170,6 +171,7 @@ track 1: selectionFlags = 0 language = und drmInitData = - + metadata = entries=[TSSE: description=null: value=Lavf56.1.0] initializationData: data = length 2, hash 5F7 total output bytes = 4019 diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump b/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump index fd58d5042e..6431ca98c6 100644 --- a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump +++ b/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump @@ -24,6 +24,7 @@ track 0: selectionFlags = 0 language = null drmInitData = - + metadata = null initializationData: data = length 29, hash 4746B5D9 data = length 10, hash 7A0D0F2B @@ -170,6 +171,7 @@ track 1: selectionFlags = 0 language = und drmInitData = - + metadata = entries=[TSSE: description=null: value=Lavf56.1.0] initializationData: data = length 2, hash 5F7 total output bytes = 470 diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java index 390e806807..f06708f07d 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java @@ -293,7 +293,7 @@ public class FlacMetadataReaderTest { FlacMetadataReader.readMetadataBlock(input, metadataHolder); - assertThat(input.getPosition()).isGreaterThan(640); + assertThat(input.getPosition()).isGreaterThan(new Long(640)); assertThat(input.getPeekPosition()).isEqualTo(input.getPosition()); }