diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/projection/MediaProjectionManager.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 9ad8dd3ab9de..0f237212c768 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -26593,7 +26593,7 @@ package android.media.projection { public final class MediaProjectionManager { method @NonNull public android.content.Intent createScreenCaptureIntent(); method @NonNull public android.content.Intent createScreenCaptureIntent(@NonNull android.media.projection.MediaProjectionConfig); - method public android.media.projection.MediaProjection getMediaProjection(int, @NonNull android.content.Intent); + method @Nullable public android.media.projection.MediaProjection getMediaProjection(int, @NonNull android.content.Intent); } } diff --git a/media/java/android/media/projection/MediaProjectionManager.java b/media/java/android/media/projection/MediaProjectionManager.java index 4013d844d811..7a7137aa7748 100644 --- a/media/java/android/media/projection/MediaProjectionManager.java +++ b/media/java/android/media/projection/MediaProjectionManager.java @@ -263,6 +263,7 @@ public final class MediaProjectionManager { * @see <a href="/guide/topics/large-screens/media-projection"> * Media projection developer guide</a> */ + @Nullable public MediaProjection getMediaProjection(int resultCode, @NonNull Intent resultData) { if (resultCode != Activity.RESULT_OK || resultData == null) { return null; |