Merge "Address API conucil feedback" into qt-dev am: ec0bd2981f (66f6e15b) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -2349,7 +2349,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @param cancellationSignal A signal to cancel the operation in progress.
		* @param callback The callback to send the action list. The actions list cannot
		* contain <code>null</code> elements.
		* contain <code>null</code> elements. You can call this on any thread.
		*/
		public void onGetDirectActions(@NonNull CancellationSignal cancellationSignal,
		@NonNull Consumer<List<DirectAction>> callback) {
		@@ -2360,10 +2360,13 @@ public class Activity extends ContextThemeWrapper
		* This is called to perform an action previously defined by the app.
		* Apps also have access to {@link #getVoiceInteractor()} to follow up on the action.
		*
		* @param actionId The ID for the action
		* @param arguments Any additional arguments provided by the caller
		* @param actionId The ID for the action you previously reported via
		* {@link #onGetDirectActions(CancellationSignal, Consumer)}.
		* @param arguments Any additional arguments provided by the caller that are
		* specific to the given action.
		* @param cancellationSignal A signal to cancel the operation in progress.
		* @param resultListener The callback to provide the result back to the caller
		* @param resultListener The callback to provide the result back to the caller.
		* You can call this on any thread. The result bundle is action specific.
		*
		* @see #onGetDirectActions(CancellationSignal, Consumer)
		*/

core/java/android/app/DirectAction.java

+41 −7

Original line number	Diff line number	Diff line
		@@ -22,12 +22,19 @@ 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
		* outside the app's UI (eg by SystemUI or assistant).
		* 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
		* such as the assistant, SystemUI, etc. You can use {@link #equals(Object)} to compare
		* instances of this class.
		*/
		public final class DirectAction implements Parcelable {

		@@ -91,7 +98,7 @@ public final class DirectAction implements Parcelable {
		}

		/**
		* Returns the ID for this action.
		* @return the ID for this action.
		*/
		@NonNull
		public String getId() {
		@@ -99,7 +106,7 @@ public final class DirectAction implements Parcelable {
		}

		/**
		* Returns any extras associated with this action.
		* @return any extras associated with this action.
		*/
		@Nullable
		public Bundle getExtras() {
		@@ -107,7 +114,7 @@ public final class DirectAction implements Parcelable {
		}

		/**
		* Returns the LocusId for the current state for the app
		* @return the LocusId for the current state for the app
		*/
		@Nullable
		public LocusId getLocusId() {
		@@ -119,6 +126,28 @@ public final class DirectAction implements Parcelable {
		return 0;
		}

		@Override
		public int hashCode() {
		return mID.hashCode();
		}

		@Override
		public boolean equals(Object other) {
		if (other == null) {
		return false;
		}

		if (other == this) {
		return true;
		}

		if (getClass() != other.getClass()) {
		return false;
		}

		return mID.equals(((DirectAction) other).mID);
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(mTaskId);
		@@ -139,7 +168,8 @@ public final class DirectAction implements Parcelable {
		/**
		* Creates a new instance.
		*
		* @param id The mandatory action id.
		* @param id The mandatory action id which must be unique in the
		* current application state.
		*/
		public Builder(@NonNull String id) {
		Preconditions.checkNotNull(id);
		@@ -147,7 +177,9 @@ public final class DirectAction implements Parcelable {
		}

		/**
		* Sets the optional action extras.
		* Sets the optional action extras. These extras are action specific
		* and their semantics are open-ended potentially representing how
		* the action is visualized, interpreted, what its arguments are, etc.
		*
		* @param extras The extras.
		* @return This builder.
		@@ -158,7 +190,9 @@ public final class DirectAction implements Parcelable {
		}

		/**
		* Sets the optional locus id.
		* Sets the optional locus id. This is an identifier of the application
		* state from a user perspective. For example, a specific chat in a
		* messaging app.
		*
		* @param locusId The locus id.
		* @return This builder.

core/java/android/service/voice/VoiceInteractionSession.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -1995,7 +1995,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		}

		/**
		* @return the index of the activity that this state is for.
		* @return the index of the activity that this state is for or -1
		* if there was no assist data captured.
		*/
		public @IntRange(from = -1) int getIndex() {
		return mIndex;
		@@ -2048,7 +2049,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		}

		/**
		* Represents the id of an assist source activity.
		* Represents the id of an assist source activity. You can use
		* {@link #equals(Object)} to compare instances of this class.
		*/
		public static class ActivityId {
		private final int mTaskId;