Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix two typos on comment." into sc-v2-dev am: 6717096333

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918347

Change-Id: I981f1a0f6d1b49152d54e58414a2135ebb466f62
This commit is contained in:
Wei Sheng Shih
2021-10-05 03:13:58 +00:00
committed by Automerger Merge Worker
parent 4c70d7cff4 6717096333
commit d005d9f546
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/Activity.java
View File

@@ -2507,12 +2507,11 @@ public class Activity extends ContextThemeWrapper
* *
* <p>To get the voice interactor you need to call {@link #getVoiceInteractor()} * <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 * 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 * longer valid because the voice interaction session that is backing is finished
* by calling {@link VoiceInteractor#registerOnDestroyedCallback(Executor, Runnable)}. * by calling {@link VoiceInteractor#registerOnDestroyedCallback(Executor, Runnable)}.
* *
* <p>This method will be called only after {@link #onStart()} is being called and * <p>This method will be called only after {@link #onStart()} and before {@link #onStop()}.
* before {@link #onStop()} is being called.
* *
* <p>You should pass to the callback the currently supported direct actions which * <p>You should pass to the callback the currently supported direct actions which
* cannot be <code>null</code> or contain <code>null</code> elements. * cannot be <code>null</code> or contain <code>null</code> elements.

3
core/java/android/app/DirectAction.java
View File

@@ -22,14 +22,13 @@ import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.view.accessibility.AccessibilityNodeInfo;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import java.util.Objects; 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 * 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 * 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 * an app interacts with components that expose alternative interaction models to the user