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: 78a7bcaf82 am: 09e6c25e5f

Browse Source 
Change-Id: I25b1fe0ad1ee00cd991ea6c1f8b058b173f7d3f7
This commit is contained in:
TreeHugger Robot
2020-04-29 09:57:48 +00:00
committed by Automerger Merge Worker
parent eb205eac81 09e6c25e5f
commit 4bf4a0f84b
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
* 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);
* }
* }