diff options
| -rw-r--r-- | core/java/android/app/Activity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index a5dd4a7207c3..340445fbf49e 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1183,6 +1183,7 @@ public class Activity extends ContextThemeWrapper * @see #setIntent(Intent, ComponentCaller) */ @FlaggedApi(android.security.Flags.FLAG_CONTENT_URI_PERMISSION_APIS) + @SuppressLint("OnNameExpected") public @Nullable ComponentCaller getCaller() { return mCaller; } @@ -1203,6 +1204,7 @@ public class Activity extends ContextThemeWrapper * @see #getCaller */ @FlaggedApi(android.security.Flags.FLAG_CONTENT_URI_PERMISSION_APIS) + @SuppressLint("OnNameExpected") public void setIntent(@Nullable Intent newIntent, @Nullable ComponentCaller newCaller) { internalSetIntent(newIntent, newCaller); } @@ -7159,6 +7161,7 @@ public class Activity extends ContextThemeWrapper * @see ComponentCaller */ @FlaggedApi(android.security.Flags.FLAG_CONTENT_URI_PERMISSION_APIS) + @SuppressLint("OnNameExpected") public @NonNull ComponentCaller getInitialCaller() { return mInitialCaller; } @@ -7186,10 +7189,11 @@ public class Activity extends ContextThemeWrapper * @see #getCaller */ @FlaggedApi(android.security.Flags.FLAG_CONTENT_URI_PERMISSION_APIS) + @SuppressLint("OnNameExpected") public @NonNull ComponentCaller getCurrentCaller() { if (mCurrentCaller == null) { throw new IllegalStateException("The caller is null because #getCurrentCaller should be" - + " called within #onNewIntent method"); + + " called within #onNewIntent or #onActivityResult methods"); } return mCurrentCaller; } |