Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52b9f9b4 authored by Brian Olson's avatar Brian Olson Committed by Automerger Merge Worker
Browse files

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

Merge "Fixing typo to include "of" in docs." into main am: 59aad3bc am: 326d1813 am: 0fcbb594 am: 1e7cd622

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



Change-Id: I50abd4e542c020ff5b551bbabea30e209be54b02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20701555 1e7cd622

core/java/android/app/Activity.java

+3 −3
Original line number Diff line number Diff line
@@ -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