Merge changes from topics "speakerid_api", "vqdr-api" into main (37a101e6) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -13176,10 +13176,12 @@ package android.service.voice {
		method public static int getMaxBundleSize();
		method public static int getMaxHotwordPhraseId();
		method public static int getMaxScore();
		method @FlaggedApi("android.service.voice.flags.allow_speaker_id_egress") public static int getMaxSpeakerId();
		method @Nullable public android.media.MediaSyncEvent getMediaSyncEvent();
		method public int getPersonalizedScore();
		method public int getProximity();
		method public int getScore();
		method @FlaggedApi("android.service.voice.flags.allow_speaker_id_egress") public int getSpeakerId();
		method public boolean isHotwordDetectionPersonalized();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int AUDIO_CHANNEL_UNSET = -1; // 0xffffffff
		@@ -13213,6 +13215,7 @@ package android.service.voice {
		method @NonNull public android.service.voice.HotwordDetectedResult.Builder setMediaSyncEvent(@NonNull android.media.MediaSyncEvent);
		method @NonNull public android.service.voice.HotwordDetectedResult.Builder setPersonalizedScore(int);
		method @NonNull public android.service.voice.HotwordDetectedResult.Builder setScore(int);
		method @FlaggedApi("android.service.voice.flags.allow_speaker_id_egress") @NonNull public android.service.voice.HotwordDetectedResult.Builder setSpeakerId(int);
		}

		public abstract class HotwordDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionInitializer {
		@@ -13351,6 +13354,22 @@ package android.service.voice {
		field public static final int ERROR_CODE_UNKNOWN = 0; // 0x0
		}

		@FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public final class VisualQueryDetectedResult implements android.os.Parcelable {
		method public int describeContents();
		method public static int getMaxSpeakerId();
		method @NonNull public String getPartialQuery();
		method public int getSpeakerId();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.service.voice.VisualQueryDetectedResult> CREATOR;
		}

		public static final class VisualQueryDetectedResult.Builder {
		ctor public VisualQueryDetectedResult.Builder();
		method @NonNull public android.service.voice.VisualQueryDetectedResult build();
		method @NonNull public android.service.voice.VisualQueryDetectedResult.Builder setPartialQuery(@NonNull String);
		method @NonNull public android.service.voice.VisualQueryDetectedResult.Builder setSpeakerId(int);
		}

		public abstract class VisualQueryDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionInitializer {
		ctor public VisualQueryDetectionService();
		method public final void finishQuery() throws java.lang.IllegalStateException;
		@@ -13362,6 +13381,7 @@ package android.service.voice {
		method public void onUpdateState(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, long, @Nullable java.util.function.IntConsumer);
		method public final void rejectQuery() throws java.lang.IllegalStateException;
		method public final void streamQuery(@NonNull String) throws java.lang.IllegalStateException;
		method @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public final void streamQuery(@NonNull android.service.voice.VisualQueryDetectedResult);
		field public static final String SERVICE_INTERFACE = "android.service.voice.VisualQueryDetectionService";
		}

		@@ -13390,6 +13410,7 @@ package android.service.voice {
		public static interface VisualQueryDetector.Callback {
		method public void onFailure(@NonNull android.service.voice.VisualQueryDetectionServiceFailure);
		method public void onQueryDetected(@NonNull String);
		method @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public default void onQueryDetected(@NonNull android.service.voice.VisualQueryDetectedResult);
		method public void onQueryFinished();
		method public void onQueryRejected();
		method public void onUnknownFailure(@NonNull String);

core/java/android/service/voice/HotwordDetectedResult.java

+86 −33

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/service/voice/IDetectorSessionVisualQueryDetectionCallback.aidl

+7 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.service.voice;

		import android.service.voice.VisualQueryDetectedResult;

		/**
		* Callback for returning the detected result from the {@link VisualQueryDetectionService}.
		*
		@@ -41,6 +43,11 @@ oneway interface IDetectorSessionVisualQueryDetectionCallback {
		*/
		void onQueryDetected(in String partialQuery);

		/**
		* Called when the detected result is streamed.
		*/
		void onResultDetected(in VisualQueryDetectedResult partialResult);

		/**
		* Called when the detected result is valid.
		*/

core/java/android/service/voice/IVisualQueryDetectionVoiceInteractionCallback.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.service.voice;

		import android.service.voice.VisualQueryDetectionServiceFailure;
		import android.service.voice.VisualQueryDetectedResult;

		/**
		* Callback for returning the detected result from the VisualQueryDetectionService.
		@@ -30,6 +31,11 @@ oneway interface IVisualQueryDetectionVoiceInteractionCallback {
		*/
		void onQueryDetected(in String partialQuery);

		/**
		* Called when the detected result is streamed.
		*/
		void onResultDetected(in VisualQueryDetectedResult partialResult);

		/**
		* Called when the detected result is valid.
		*/

core/java/android/service/voice/VisualQueryDetectedResult.aidl

0 → 100644

+19 −0

File added.

Preview size limit exceeded, changes collapsed.