Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing typo to include "of" in docs." into main am: 59aad3bc8f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2645004

Change-Id: I84cf37e393fdd4a839f2935f705c43aa4b61e276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brian Olson
2023-07-07 15:04:26 +00:00
committed by Automerger Merge Worker
parent 3b6bf6842b 59aad3bc8f
commit 326d181371
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/Activity.java
View File

@@ -2215,9 +2215,9 @@ public class Activity extends ContextThemeWrapper
* *
* <p>An activity can never receive a new intent in the resumed state. You can count on * <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 * {@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 * the completion of this callback. If the activity was resumed, it will be paused and new
* will be delivered, followed by {@link #onResume}. If the activity wasn't in the resumed * intent will be delivered, followed by {@link #onResume}. If the activity wasn't in the
* state, then new intent can be delivered immediately, with {@link #onResume()} called * resumed state, then new intent can be delivered immediately, with {@link #onResume()} called
* sometime later when activity becomes active again. * sometime later when activity becomes active again.
* *
* <p>Note that {@link #getIntent} still returns the original Intent. You * <p>Note that {@link #getIntent} still returns the original Intent. You