summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Solovay <asolovay@google.com>2022-08-01 19:21:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-08-01 19:21:36 +0000
commit22dd45bd59ce74b22b0d04c06e0696e8679c4842 (patch)
tree0aa0506229043e5544aa4893dae01254082c3c43
parent9b846de1471fbe19b80a113fdab75482d4d142b7 (diff)
parentca59840e0f6eb5292e2fab8f1a6f8959d5ee5f5f (diff)
downloadbase-22dd45bd59ce74b22b0d04c06e0696e8679c4842.tar.gz
Merge "docs: Fixing typo in Activity reference" into tm-dev
-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