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

Commit 1bf43540 authored by Patrick Williams's avatar Patrick Williams Committed by Android (Google) Code Review
Browse files

Merge "Make launchCookie non-null in createScreenCaptureIntent" into main

parents 20f8ed39 fa477274

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2089,7 +2089,7 @@ package android.media.metrics { 
package android.media.projection {



  public final class MediaProjectionManager {

    method @NonNull public android.content.Intent createScreenCaptureIntent(@Nullable android.app.ActivityOptions.LaunchCookie);

    method @NonNull public android.content.Intent createScreenCaptureIntent(@NonNull android.app.ActivityOptions.LaunchCookie);

  }



}

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

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public final class MediaProjectionManager { 
    @SuppressLint("UnflaggedApi")

    @TestApi

    @NonNull

    public Intent createScreenCaptureIntent(@Nullable LaunchCookie launchCookie) {

    public Intent createScreenCaptureIntent(@NonNull LaunchCookie launchCookie) {

        Intent i = createScreenCaptureIntent();

        i.putExtra(EXTRA_LAUNCH_COOKIE, launchCookie);

        return i;