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

Commit 61605574 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "transcoding: Reenable api_lint" into sc-dev

parents 7116f049 718450cc

apex/media/framework/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -133,9 +133,6 @@ java_sdk_library { 
        ":updatable-media-srcs",

    ],



    api_lint: {

        enabled: false,

    },

    impl_library_visibility: ["//frameworks/av/apex:__subpackages__"],

}

apex/media/framework/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ package android.media { 
    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest build();

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setClientPid(int);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setClientUid(int);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setDestinationFileDescriptor(android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setSourceFileDescriptor(android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setDestinationFileDescriptor(@NonNull android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setSourceFileDescriptor(@NonNull android.os.ParcelFileDescriptor);

  }



}

apex/media/framework/java/android/media/MediaTranscodeManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1207,14 +1207,14 @@ public final class MediaTranscodeManager { 


            @Override

            @NonNull

            public Builder setSourceFileDescriptor(ParcelFileDescriptor fd) {

            public Builder setSourceFileDescriptor(@NonNull ParcelFileDescriptor fd) {

                super.setSourceFileDescriptor(fd);

                return self();

            }



            @Override

            @NonNull

            public Builder setDestinationFileDescriptor(ParcelFileDescriptor fd) {

            public Builder setDestinationFileDescriptor(@NonNull ParcelFileDescriptor fd) {

                super.setDestinationFileDescriptor(fd);

                return self();

            }