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

Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev am: edea65c7bd am: 11ba586199

Browse Source 
Change-Id: I148f1d22f7f75f6eee421034fca2aba7212df86b
This commit is contained in:
TreeHugger Robot
2020-04-29 09:53:31 +00:00
committed by Automerger Merge Worker
parent 0e294ad93f 11ba586199
commit 1580e07131
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/media/framework/java/android/media/MediaParser.java
View File

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