Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43c88f34 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

Add media2 build target to prevent hidden API usage in MediaPlayer2 

The only hidden API usuage, c-tor of TimedText, is temporarily commented
out.

Test: make media2
Bug: 112766913
Change-Id: I6330724e65bb42db678f23134677dfd8675a3970
parent 87ad3e7a

media/Android.bp

0 → 100644
+36 −0
Original line number Diff line number Diff line 
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",

    ],

}

media/java/android/media/MediaPlayer2.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

            */

        }

    }