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

Commit 01fcc95c authored by Azhara Assanova's avatar Azhara Assanova
Browse files

Correct nullability annotation in onActivityResult() 

The intent argument inside Activity#onActivityResult should be @Nullable
instead of @NonNull. That is because apps can set the result via
Activity#setResult(int resultCode), which leads to a null result intent.

Bug: 293467489
Test: m and flash
Change-Id: I962c477cde556803277483d58423292d4f70e0c3
parent 3da334ca

core/api/current.txt

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

    method public void onActivityReenter(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 public void onAttachedToWindow();

    method @Deprecated public void onBackPressed();

core/java/android/app/Activity.java

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

     */

    @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) {

        onActivityResult(requestCode, resultCode, data);

    }