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

Commit 9b592208 authored by Andrew Solovay's avatar Andrew Solovay Committed by Automerger Merge Worker
Browse files

Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd am:... 

Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd am: 7d00787c am: 81d565f6

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



Change-Id: Ie1005547ba0e0d2793df4269b19588bc20698cfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a7fb9ec 81d565f6

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ import java.util.function.Consumer; 
 * <li>The <b>foreground lifetime</b> of an activity happens between a call to

 * {@link android.app.Activity#onResume} until a corresponding call to

 * {@link android.app.Activity#onPause}.  During this time the activity is

 * in visible, active and interacting with the user.  An activity

 * visible, active and interacting with the user.  An activity

 * can frequently go between the resumed and paused states -- for example when

 * the device goes to sleep, when an activity result is delivered, when a new

 * intent is delivered -- so the code in these methods should be fairly