summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Solovay <asolovay@google.com> 2022-08-01 19:40:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-01 19:40:06 +0000
commit7d00787cbfa7c6839f2f69c108ba34fc2c84face (patch)
tree4748d299580da2ff8cd40f64ce81b2d259ba835f
parent66f6dad11654930758e5220d1db20050570bc499 (diff)
parent22dd45bd59ce74b22b0d04c06e0696e8679c4842 (diff)
Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19278953 Change-Id: Iaa1ea8164208ef999ceb58a8eb25b8e6e5385888 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