Merge "[audio] Rename ST isAllowMultipleTriggers for API" into main (c1827d26) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -7192,8 +7192,8 @@ package android.hardware.soundtrigger {
		method public int getAudioCapabilities();
		method @NonNull public byte[] getData();
		method @NonNull public java.util.List<android.hardware.soundtrigger.SoundTrigger.KeyphraseRecognitionExtra> getKeyphrases();
		method public boolean isAllowMultipleTriggers();
		method public boolean isCaptureRequested();
		method public boolean isMultipleTriggersAllowed();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.soundtrigger.SoundTrigger.RecognitionConfig> CREATOR;
		}
		@@ -7201,11 +7201,11 @@ package android.hardware.soundtrigger {
		public static final class SoundTrigger.RecognitionConfig.Builder {
		ctor public SoundTrigger.RecognitionConfig.Builder();
		method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig build();
		method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setAllowMultipleTriggers(boolean);
		method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setAudioCapabilities(int);
		method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setCaptureRequested(boolean);
		method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setData(@NonNull byte[]);
		method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setKeyphrases(@NonNull java.util.Collection<android.hardware.soundtrigger.SoundTrigger.KeyphraseRecognitionExtra>);
		method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setMultipleTriggersAllowed(boolean);
		}

		public static class SoundTrigger.RecognitionEvent {

core/java/android/hardware/soundtrigger/ConversionUtil.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ public class ConversionUtil {
		SoundTrigger.RecognitionConfig apiConfig) {
		RecognitionConfig aidlConfig = new RecognitionConfig();
		aidlConfig.captureRequested = apiConfig.isCaptureRequested();
		// apiConfig.isAllowMultipleTriggers() is ignored by the lower layers.
		// apiConfig.isMultipleTriggersAllowed() is ignored by the lower layers.
		aidlConfig.phraseRecognitionExtras =
		new PhraseRecognitionExtra[apiConfig.getKeyphrases().size()];
		for (int i = 0; i < apiConfig.getKeyphrases().size(); ++i) {
		@@ -178,7 +178,7 @@ public class ConversionUtil {
		}
		return new SoundTrigger.RecognitionConfig.Builder()
		.setCaptureRequested(aidlConfig.captureRequested)
		.setAllowMultipleTriggers(false)
		.setMultipleTriggersAllowed(false)
		.setKeyphrases(keyphrases)
		.setData(Arrays.copyOf(aidlConfig.data, aidlConfig.data.length))
		.setAudioCapabilities(aidl2apiAudioCapabilities(aidlConfig.audioCapabilities))

core/java/android/hardware/soundtrigger/SoundTrigger.java

+21 −21

Original line number	Diff line number	Diff line
		@@ -1518,7 +1518,7 @@ public class SoundTrigger {
		@FlaggedApi(android.media.soundtrigger.Flags.FLAG_MANAGER_API)
		public static final class RecognitionConfig implements Parcelable {
		private final boolean mCaptureRequested;
		private final boolean mAllowMultipleTriggers;
		private final boolean mMultipleTriggersAllowed;
		private final KeyphraseRecognitionExtra mKeyphrases[];
		private final byte[] mData;
		private final @ModuleProperties.AudioCapabilities int mAudioCapabilities;
		@@ -1529,7 +1529,7 @@ public class SoundTrigger {
		* {@link SoundTriggerModule#startRecognition(int, RecognitionConfig)}
		*
		* @param captureRequested Whether the DSP should capture the trigger sound.
		* @param allowMultipleTriggers Whether the service should restart listening after the DSP
		* @param multipleTriggersAllowed Whether the service should restart listening after the DSP
		* triggers.
		* @param keyphrases List of keyphrases in the sound model.
		* @param data Opaque data for use by system applications who know about voice engine
		@@ -1537,11 +1537,11 @@ public class SoundTrigger {
		* @param audioCapabilities Bit field encoding of the AudioCapabilities. See
		* {@link ModuleProperties.AudioCapabilities} for details.
		*/
		private RecognitionConfig(boolean captureRequested, boolean allowMultipleTriggers,
		private RecognitionConfig(boolean captureRequested, boolean multipleTriggersAllowed,
		@Nullable KeyphraseRecognitionExtra[] keyphrases, @Nullable byte[] data,
		@ModuleProperties.AudioCapabilities int audioCapabilities) {
		this.mCaptureRequested = captureRequested;
		this.mAllowMultipleTriggers = allowMultipleTriggers;
		this.mMultipleTriggersAllowed = multipleTriggersAllowed;
		this.mKeyphrases = keyphrases != null ? keyphrases : new KeyphraseRecognitionExtra[0];
		this.mData = data != null ? data : new byte[0];
		this.mAudioCapabilities = audioCapabilities;
		@@ -1553,7 +1553,7 @@ public class SoundTrigger {
		*
		* @deprecated Use {@link Builder} instead.
		* @param captureRequested Whether the DSP should capture the trigger sound.
		* @param allowMultipleTriggers Whether the service should restart listening after the DSP
		* @param multipleTriggersAllowed Whether the service should restart listening after the DSP
		* triggers.
		* @param keyphrases List of keyphrases in the sound model.
		* @param data Opaque data for use by system applications.
		@@ -1563,9 +1563,9 @@ public class SoundTrigger {
		@UnsupportedAppUsage
		@Deprecated
		@TestApi
		public RecognitionConfig(boolean captureRequested, boolean allowMultipleTriggers,
		public RecognitionConfig(boolean captureRequested, boolean multipleTriggersAllowed,
		@Nullable KeyphraseRecognitionExtra[] keyphrases, @Nullable byte[] data) {
		this(captureRequested, allowMultipleTriggers, keyphrases, data, 0);
		this(captureRequested, multipleTriggersAllowed, keyphrases, data, 0);
		}

		public static final @android.annotation.NonNull Parcelable.Creator<RecognitionConfig> CREATOR
		@@ -1593,8 +1593,8 @@ public class SoundTrigger {
		* <p><b>Note:</b> This config flag is currently used at the service layer rather than by
		* the DSP.
		*/
		public boolean isAllowMultipleTriggers() {
		return mAllowMultipleTriggers;
		public boolean isMultipleTriggersAllowed() {
		return mMultipleTriggersAllowed;
		}

		/**
		@@ -1627,19 +1627,19 @@ public class SoundTrigger {

		private static RecognitionConfig fromParcel(Parcel in) {
		boolean captureRequested = in.readBoolean();
		boolean allowMultipleTriggers = in.readBoolean();
		boolean multipleTriggersAllowed = in.readBoolean();
		KeyphraseRecognitionExtra[] keyphrases =
		in.createTypedArray(KeyphraseRecognitionExtra.CREATOR);
		byte[] data = in.createByteArray();
		int audioCapabilities = in.readInt();
		return new RecognitionConfig(captureRequested, allowMultipleTriggers, keyphrases, data,
		audioCapabilities);
		return new RecognitionConfig(captureRequested, multipleTriggersAllowed, keyphrases,
		data, audioCapabilities);
		}

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeBoolean(mCaptureRequested);
		dest.writeBoolean(mAllowMultipleTriggers);
		dest.writeBoolean(mMultipleTriggersAllowed);
		dest.writeTypedArray(mKeyphrases, flags);
		dest.writeByteArray(mData);
		dest.writeInt(mAudioCapabilities);
		@@ -1653,7 +1653,7 @@ public class SoundTrigger {
		@Override
		public String toString() {
		return "RecognitionConfig [captureRequested=" + mCaptureRequested
		+ ", allowMultipleTriggers=" + mAllowMultipleTriggers + ", keyphrases="
		+ ", multipleTriggersAllowed=" + mMultipleTriggersAllowed + ", keyphrases="
		+ Arrays.toString(mKeyphrases) + ", data=" + Arrays.toString(mData)
		+ ", audioCapabilities=" + Integer.toHexString(mAudioCapabilities) + "]";
		}
		@@ -1670,7 +1670,7 @@ public class SoundTrigger {
		if (mCaptureRequested != other.mCaptureRequested) {
		return false;
		}
		if (mAllowMultipleTriggers != other.mAllowMultipleTriggers) {
		if (mMultipleTriggersAllowed != other.mMultipleTriggersAllowed) {
		return false;
		}
		if (!Arrays.equals(mKeyphrases, other.mKeyphrases)) {
		@@ -1690,7 +1690,7 @@ public class SoundTrigger {
		final int prime = 31;
		int result = 1;
		result = prime * result + (mCaptureRequested ? 1 : 0);
		result = prime * result + (mAllowMultipleTriggers ? 1 : 0);
		result = prime * result + (mMultipleTriggersAllowed ? 1 : 0);
		result = prime * result + Arrays.hashCode(mKeyphrases);
		result = prime * result + Arrays.hashCode(mData);
		result = prime * result + mAudioCapabilities;
		@@ -1702,7 +1702,7 @@ public class SoundTrigger {
		*/
		public static final class Builder {
		private boolean mCaptureRequested;
		private boolean mAllowMultipleTriggers;
		private boolean mMultipleTriggersAllowed;
		@Nullable private KeyphraseRecognitionExtra[] mKeyphrases;
		@Nullable private byte[] mData;
		private @ModuleProperties.AudioCapabilities int mAudioCapabilities;
		@@ -1725,12 +1725,12 @@ public class SoundTrigger {

		/**
		* Sets allow multiple triggers state.
		* @param allowMultipleTriggers Whether the service should restart listening after the
		* @param multipleTriggersAllowed Whether the service should restart listening after the
		* DSP triggers.
		* @return the same Builder instance.
		*/
		public @NonNull Builder setAllowMultipleTriggers(boolean allowMultipleTriggers) {
		mAllowMultipleTriggers = allowMultipleTriggers;
		public @NonNull Builder setMultipleTriggersAllowed(boolean multipleTriggersAllowed) {
		mMultipleTriggersAllowed = multipleTriggersAllowed;
		return this;
		}

		@@ -1779,7 +1779,7 @@ public class SoundTrigger {
		public @NonNull RecognitionConfig build() {
		RecognitionConfig config = new RecognitionConfig(
		/* captureRequested= */ mCaptureRequested,
		/* allowMultipleTriggers= */ mAllowMultipleTriggers,
		/* multipleTriggersAllowed= */ mMultipleTriggersAllowed,
		/* keyphrases= */ mKeyphrases,
		/* data= */ mData,
		/* audioCapabilities= */ mAudioCapabilities);

core/java/android/service/voice/AlwaysOnHotwordDetector.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1541,7 +1541,7 @@ public class AlwaysOnHotwordDetector extends AbstractDetector {
		mInternalCallback,
		new RecognitionConfig.Builder()
		.setCaptureRequested(captureTriggerAudio)
		.setAllowMultipleTriggers(allowMultipleTriggers)
		.setMultipleTriggersAllowed(allowMultipleTriggers)
		.setKeyphrases(recognitionExtra)
		.setData(data)
		.setAudioCapabilities(audioCapabilities)

media/java/android/media/soundtrigger/SoundTriggerDetector.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ public final class SoundTriggerDetector {
		mRecognitionCallback,
		new RecognitionConfig.Builder()
		.setCaptureRequested(captureTriggerAudio)
		.setAllowMultipleTriggers(allowMultipleTriggers)
		.setMultipleTriggersAllowed(allowMultipleTriggers)
		.setAudioCapabilities(audioCapabilities)
		.build(),
		runInBatterySaver);