summaryrefslogtreecommitdiff
path: root/apex/media
diff options
context:
space:
mode:
Diffstat (limited to 'apex/media')
-rw-r--r--apex/media/framework/Android.bp4
-rw-r--r--apex/media/framework/java/android/media/MediaParser.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 34fe22879ca9..48e7ec760f97 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -92,6 +92,7 @@ stubs_defaults {
// TODO(b/135922046) remove this
include_dirs: ["frameworks/base/core/java"],
},
+ dist: { dest: "framework-media.txt" },
}
droidstubs {
@@ -130,18 +131,21 @@ java_library {
name: "framework-media-stubs-publicapi",
srcs: [":framework-media-stubs-srcs-publicapi"],
defaults: ["framework-module-stubs-lib-defaults-publicapi"],
+ dist: { dest: "framework-media.jar" },
}
java_library {
name: "framework-media-stubs-systemapi",
srcs: [":framework-media-stubs-srcs-systemapi"],
defaults: ["framework-module-stubs-lib-defaults-systemapi"],
+ dist: { dest: "framework-media.jar" },
}
java_library {
name: "framework-media-stubs-module_libs_api",
srcs: [":framework-media-stubs-srcs-module_libs_api"],
defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
+ dist: { dest: "framework-media.jar" },
}
java_library {
diff --git a/apex/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java
index 4fe5fa8e48b4..a9ed6d82b873 100644
--- a/apex/media/framework/java/android/media/MediaParser.java
+++ b/apex/media/framework/java/android/media/MediaParser.java
@@ -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);
* }
* }