Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d005d9f5 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I981f1a0f6d1b49152d54e58414a2135ebb466f62
parents 4c70d7cf 67170963

core/java/android/app/Activity.java

+2 −3
Original line number Diff line number Diff line
@@ -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.

core/java/android/app/DirectAction.java

+1 −2
Original line number Diff line number Diff line
@@ -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