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

Commit 602eb758 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unicode in documentation generated from this code" into main am:... 

Merge "Fix unicode in documentation generated from this code" into main am: 82470eb3 am: f3f5ee25 am: 5a8157e7

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



Change-Id: Ida8c7e02410df6d7d361be1c845d355344cbb6e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fe46e68 5a8157e7

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -2039,7 +2039,7 @@ public class Activity extends ContextThemeWrapper 
     * indicator that the activity became active and ready to receive input. This sometimes could

     * also be a transit state toward another resting state. For instance, an activity may be

     * relaunched to {@link #onPause} due to configuration changes and the activity was visible,

     * but wasn’t the top-most activity of an activity task. {@link #onResume} is guaranteed to be

     * but wasn't the top-most activity of an activity task. {@link #onResume} is guaranteed to be

     * called before {@link #onPause} in this case which honors the activity lifecycle policy and

     * the activity eventually rests in {@link #onPause}.

     *