Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev (edea65c7) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ import java.util.UUID;
		* @Override
		* public void onTrackDataFound(int i, @NonNull TrackData trackData) {
		* MediaFormat mediaFormat = trackData.mediaFormat;
		* if (videoTrackIndex == -1 &&
		* if (videoTrackIndex == -1 &&
		* mediaFormat
		* .getString(MediaFormat.KEY_MIME, /* defaultValue= */ "")
		* .startsWith("video/")) {
		@@ -178,7 +178,7 @@ import java.util.UUID;
		*
		* private void ensureSpaceInBuffer(int numberOfBytesToRead) {
		* int requiredLength = bytesWrittenCount + numberOfBytesToRead;
		* if (requiredLength > sampleDataBuffer.length) {
		* if (requiredLength > sampleDataBuffer.length) {
		* sampleDataBuffer = Arrays.copyOf(sampleDataBuffer, requiredLength);
		* }
		* }