summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Solovay <asolovay@google.com> 2022-08-01 19:59:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-01 19:59:29 +0000
commit9ea22aa59ac6bb0bf86e19c35cf796f00abdca25 (patch)
tree44110157e7fb872413b10e4d6a0e64b17b37960f
parentb7410de249711019f17824da0ef970f48e007445 (diff)
parent7d00787cbfa7c6839f2f69c108ba34fc2c84face (diff)
Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd59 am: 7d00787cbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19278953 Change-Id: Iaf5cc2f2572d9df95e3f590dc71c2bed9ea1d924 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/app/Activity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 7141259d7dce..7d5fb3eb6ee8 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -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