diff options
| -rw-r--r-- | media/Android.bp | 36 | ||||
| -rw-r--r-- | media/java/android/media/MediaPlayer2.java | 5 |
2 files changed, 41 insertions, 0 deletions
diff --git a/media/Android.bp b/media/Android.bp new file mode 100644 index 000000000000..d5da6f266952 --- /dev/null +++ b/media/Android.bp @@ -0,0 +1,36 @@ +java_library { + // TODO: include media2.jar in the media apex and add it to the bootclasspath. + name: "media2", + + srcs: [ + ":media2-srcs", + ":framework-media-annotation-srcs", + ], + + static_libs: [ + "mediaplayer2-protos", + ], + + // Make sure that the implementaion only relies on SDK or system APIs. + sdk_version: "system_current", +} + +filegroup { + name: "media2-srcs", + srcs: [ + "java/android/media/CloseGuard.java", + "java/android/media/DataSourceCallback.java", + "java/android/media/DataSourceDesc.java", + "java/android/media/UriDataSourceDesc.java", + "java/android/media/FileDataSourceDesc.java", + "java/android/media/CallbackDataSourceDesc.java", + "java/android/media/VideoSize.java", + "java/android/media/Media2Utils.java", + "java/android/media/MediaPlayer2Utils.java", + "java/android/media/MediaPlayer2.java", + "java/android/media/Media2HTTPService.java", + "java/android/media/Media2HTTPConnection.java", + "java/android/media/RoutingDelegate.java", + "java/android/media/BufferingParams.java", + ], +} diff --git a/media/java/android/media/MediaPlayer2.java b/media/java/android/media/MediaPlayer2.java index 9038f72f1476..d4b1c7f868cb 100644 --- a/media/java/android/media/MediaPlayer2.java +++ b/media/java/android/media/MediaPlayer2.java @@ -3960,7 +3960,12 @@ public class MediaPlayer2 implements AutoCloseable textBounds = new Rect(left, top, right, bottom); } } + return null; + /* TimedText c-tor usage is temporarily commented out. + * TODO(b/117527789): use SUBTITLE path for MEDIA_MIMETYPE_TEXT_3GPP track + * and remove TimedText path from MediaPlayer2. return new TimedText(textChars, textBounds); + */ } } |