diff options
| author | 2023-07-07 16:32:13 +0000 | |
|---|---|---|
| committer | 2023-07-07 16:32:13 +0000 | |
| commit | 1e7cd622ab90d976d99ca3902306fd18effd9998 (patch) | |
| tree | cbbe3652b32221709337c4b2bff320b330cadb45 | |
| parent | af1ccfe9fddfe87a5e44de8c3d675665385636d9 (diff) | |
| parent | 0fcbb594b060f19691c25223ada1f58ab086e678 (diff) | |
Merge "Fixing typo to include "of" in docs." into main am: 59aad3bc8f am: 326d181371 am: 0fcbb594b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2645004
Change-Id: I9d0e3f8cf95040b08c6418a54d38b0dce658b165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/Activity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 70a2e5382f60..e5494900717c 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2258,9 +2258,9 @@ public class Activity extends ContextThemeWrapper * * <p>An activity can never receive a new intent in the resumed state. You can count on * {@link #onResume} being called after this method, though not necessarily immediately after - * the completion this callback. If the activity was resumed, it will be paused and new intent - * will be delivered, followed by {@link #onResume}. If the activity wasn't in the resumed - * state, then new intent can be delivered immediately, with {@link #onResume()} called + * the completion of this callback. If the activity was resumed, it will be paused and new + * intent will be delivered, followed by {@link #onResume}. If the activity wasn't in the + * resumed state, then new intent can be delivered immediately, with {@link #onResume()} called * sometime later when activity becomes active again. * * <p>Note that {@link #getIntent} still returns the original Intent. You |