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

Commit c7d44bca authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mark MediaProjection#getMediaProjection as Nullable" into main

parents f53437f6 6ba668b4

core/api/current.txt

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

  }















}

























media/java/android/media/projection/MediaProjectionManager.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -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;