diff options
| -rw-r--r-- | apex/media/framework/Android.bp | 3 | ||||
| -rw-r--r-- | apex/media/framework/api/system-current.txt | 4 | ||||
| -rw-r--r-- | apex/media/framework/java/android/media/MediaTranscodeManager.java | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp index 3cf585e73003..7020f1824fda 100644 --- a/apex/media/framework/Android.bp +++ b/apex/media/framework/Android.bp @@ -133,9 +133,6 @@ java_sdk_library { ":updatable-media-srcs", ], - api_lint: { - enabled: false, - }, impl_library_visibility: ["//frameworks/av/apex:__subpackages__"], } diff --git a/apex/media/framework/api/system-current.txt b/apex/media/framework/api/system-current.txt index 8d83309f5be0..7df0b4be95c0 100644 --- a/apex/media/framework/api/system-current.txt +++ b/apex/media/framework/api/system-current.txt @@ -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); } } diff --git a/apex/media/framework/java/android/media/MediaTranscodeManager.java b/apex/media/framework/java/android/media/MediaTranscodeManager.java index 775b0e54b24c..a7de602abc1e 100644 --- a/apex/media/framework/java/android/media/MediaTranscodeManager.java +++ b/apex/media/framework/java/android/media/MediaTranscodeManager.java @@ -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(); } |