diff options
| author | 2024-03-12 10:48:48 +0000 | |
|---|---|---|
| committer | 2024-03-12 10:48:48 +0000 | |
| commit | 0cf242fd98207b67cd7618884184c1afa33a917f (patch) | |
| tree | 7e63f6c1308bb7fd368f375a92677f16d0f54beb | |
| parent | 92b2dcc786edcc77fa3ef77f473754e8abdc77b7 (diff) | |
| parent | 01fcc95c063c6291152d4cb3c153075585c3ab30 (diff) | |
Merge "Correct nullability annotation in onActivityResult()" into main
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | 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 e0b919a8dc4a..7552b5c00acc 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); } |