summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author wilsonshih <wilsonshih@google.com> 2021-09-27 14:05:14 +0800
committer wilsonshih <wilsonshih@google.com> 2021-09-27 16:55:15 +0800
commite887ea4a29f77ba907fc91c2d9b6fca7ebae78c2 (patch)
tree855603e6f10a0fe7c28c7bc557752022b1d05155
parent3cbec410eeed1cfe31f4cff43d6acff09935244a (diff)
Fix two typos on comment.
Update some comments. Fixes: 201111278 Fixes: 201111766 Test: TH pass Change-Id: I20b6eb1b9bd6e47f9e94ee0ab13b3e4be9d09ec4
-rw-r--r--core/java/android/app/Activity.java5
-rw-r--r--core/java/android/app/DirectAction.java3
2 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 12025f98ada8..22091fcde86f 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2507,12 +2507,11 @@ public class Activity extends ContextThemeWrapper
*
* <p>To get the voice interactor you need to call {@link #getVoiceInteractor()}
* which would return non <code>null</code> only if there is an ongoing voice
- * interaction session. You an also detect when the voice interactor is no
+ * interaction session. You can also detect when the voice interactor is no
* longer valid because the voice interaction session that is backing is finished
* by calling {@link VoiceInteractor#registerOnDestroyedCallback(Executor, Runnable)}.
*
- * <p>This method will be called only after {@link #onStart()} is being called and
- * before {@link #onStop()} is being called.
+ * <p>This method will be called only after {@link #onStart()} and before {@link #onStop()}.
*
* <p>You should pass to the callback the currently supported direct actions which
* cannot be <code>null</code> or contain <code>null</code> elements.
diff --git a/core/java/android/app/DirectAction.java b/core/java/android/app/DirectAction.java
index b0ed490369ad..ac3868b2ece9 100644
--- a/core/java/android/app/DirectAction.java
+++ b/core/java/android/app/DirectAction.java
@@ -22,14 +22,13 @@ import android.os.Bundle;
import android.os.IBinder;
import android.os.Parcel;
import android.os.Parcelable;
-import android.view.accessibility.AccessibilityNodeInfo;
import com.android.internal.util.Preconditions;
import java.util.Objects;
/**
- * Represents a abstract action that can be perform on this app. This are requested from
+ * Represents an abstract action that can be perform on this app. This are requested from
* outside the app's UI (eg by SystemUI or assistant). The semantics of these actions are
* not specified by the OS. This allows open-ended and scalable approach for defining how
* an app interacts with components that expose alternative interaction models to the user