summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-08 19:41:47 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-08-08 19:41:47 +0000
commit82470eb398a82833220d5b462ab8154e4c79a182 (patch)
treee68b3e61a9c2ce29d99588c85da25935a1190025
parent156bf471646e18ca994d17995555f9d9dc6a35ad (diff)
parent1bfde13e7aaceefe2231b18741aa48cbb30420f4 (diff)
Merge "Fix unicode in documentation generated from this code" into main
-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 8fc2fa796f88..a24007e09d9c 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1996,7 +1996,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}.
*