Commit f88f4ed2 authored Jun 05, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Jun 05, 2020

Merge "Use MediaParser SeekMap unknown duration constant" into rvc-dev am: 7c41c815

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744204

Change-Id: Ied5c27cc66037a766e163c665e2fea907c0abdef

parents efc58b4a 7c41c815

apex/media/framework/java/android/media/MediaParser.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,8 @@ public final class MediaParser {
		* duration is unknown.
		*/
		public long getDurationMicros() {
		return mExoPlayerSeekMap.getDurationUs();
		long durationUs = mExoPlayerSeekMap.getDurationUs();
		return durationUs != C.TIME_UNSET ? durationUs : UNKNOWN_DURATION;
		}

		/**