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

Commit 0cf242fd authored by Azhara Assanova's avatar Azhara Assanova Committed by Android (Google) Code Review
Browse files

Merge "Correct nullability annotation in onActivityResult()" into main

parents 92b2dcc7 01fcc95c

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -4482,7 +4482,7 @@ package android.app { 
    method @CallSuper public void onActionModeStarted(android.view.ActionMode);

    method @CallSuper public void onActionModeStarted(android.view.ActionMode);

    method public void onActivityReenter(int, android.content.Intent);

    method public void onActivityReenter(int, android.content.Intent);

    method protected void onActivityResult(int, int, android.content.Intent);

    method protected void onActivityResult(int, int, android.content.Intent);

    method @FlaggedApi("android.security.content_uri_permission_apis") public void onActivityResult(int, int, @NonNull android.content.Intent, @NonNull android.app.ComponentCaller);

    method @FlaggedApi("android.security.content_uri_permission_apis") public void onActivityResult(int, int, @Nullable android.content.Intent, @NonNull android.app.ComponentCaller);

    method @Deprecated public void onAttachFragment(android.app.Fragment);

    method @Deprecated public void onAttachFragment(android.app.Fragment);

    method public void onAttachedToWindow();

    method public void onAttachedToWindow();

    method @Deprecated public void onBackPressed();

    method @Deprecated public void onBackPressed();

core/java/android/app/Activity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -7473,7 +7473,7 @@ public class Activity extends ContextThemeWrapper 
     *               intent.

     *               intent.

     */

     */

    @FlaggedApi(android.security.Flags.FLAG_CONTENT_URI_PERMISSION_APIS)

    @FlaggedApi(android.security.Flags.FLAG_CONTENT_URI_PERMISSION_APIS)

    public void onActivityResult(int requestCode, int resultCode, @NonNull Intent data,

    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data,

            @NonNull ComponentCaller caller) {

            @NonNull ComponentCaller caller) {

        onActivityResult(requestCode, resultCode, data);

        onActivityResult(requestCode, resultCode, data);

    }

    }