From 01fcc95c063c6291152d4cb3c153075585c3ab30 Mon Sep 17 00:00:00 2001 From: Azhara Assanova Date: Fri, 8 Mar 2024 17:37:38 +0000 Subject: 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 --- core/api/current.txt | 2 +- core/java/android/app/Activity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 5772fb485f7a..ecb2a2a44435 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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(); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index afbefca0cefe..1cc2d25fb76d 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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); } -- cgit v1.2.3-59-g8ed1b