Merge "remove SoundTrigger public member variables" into rvc-dev am: 95ee3d7ad5 am: 49284c8a1f (1f73860d) · Commits · e / os / android_frameworks_base

api/system-current.txt

+27 −27

Original line number	Diff line number	Diff line
		@@ -3575,23 +3575,23 @@ package android.hardware.soundtrigger {

		public static final class SoundTrigger.Keyphrase implements android.os.Parcelable {
		ctor public SoundTrigger.Keyphrase(int, int, @NonNull java.util.Locale, @NonNull String, @Nullable int[]);
		method public int getId();
		method @NonNull public java.util.Locale getLocale();
		method public int getRecognitionModes();
		method @NonNull public String getText();
		method @NonNull public int[] getUsers();
		method @NonNull public static android.hardware.soundtrigger.SoundTrigger.Keyphrase readFromParcel(@NonNull android.os.Parcel);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.soundtrigger.SoundTrigger.Keyphrase> CREATOR;
		field public final int id;
		field @NonNull public final java.util.Locale locale;
		field public final int recognitionModes;
		field @NonNull public final String text;
		field @NonNull public final int[] users;
		}

		public static final class SoundTrigger.KeyphraseSoundModel extends android.hardware.soundtrigger.SoundTrigger.SoundModel implements android.os.Parcelable {
		ctor public SoundTrigger.KeyphraseSoundModel(@NonNull java.util.UUID, @NonNull java.util.UUID, @Nullable byte[], @Nullable android.hardware.soundtrigger.SoundTrigger.Keyphrase[], int);
		ctor public SoundTrigger.KeyphraseSoundModel(@NonNull java.util.UUID, @NonNull java.util.UUID, @Nullable byte[], @Nullable android.hardware.soundtrigger.SoundTrigger.Keyphrase[]);
		method @NonNull public android.hardware.soundtrigger.SoundTrigger.Keyphrase[] getKeyphrases();
		method @NonNull public static android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel readFromParcel(@NonNull android.os.Parcel);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel> CREATOR;
		field @NonNull public final android.hardware.soundtrigger.SoundTrigger.Keyphrase[] keyphrases;
		}

		public static final class SoundTrigger.ModelParamRange implements android.os.Parcelable {
		@@ -3603,26 +3603,26 @@ package android.hardware.soundtrigger {

		public static final class SoundTrigger.ModuleProperties implements android.os.Parcelable {
		method public int describeContents();
		method public int getAudioCapabilities();
		method @NonNull public String getDescription();
		method public int getId();
		method @NonNull public String getImplementor();
		method public int getMaxBufferMillis();
		method public int getMaxKeyphrases();
		method public int getMaxSoundModels();
		method public int getMaxUsers();
		method public int getPowerConsumptionMw();
		method public int getRecognitionModes();
		method @NonNull public String getSupportedModelArch();
		method @NonNull public java.util.UUID getUuid();
		method public int getVersion();
		method public boolean isCaptureTransitionSupported();
		method public boolean isConcurrentCaptureSupported();
		method public boolean isTriggerReturnedInEvent();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int AUDIO_CAPABILITY_ECHO_CANCELLATION = 1; // 0x1
		field public static final int AUDIO_CAPABILITY_NOISE_SUPPRESSION = 2; // 0x2
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.soundtrigger.SoundTrigger.ModuleProperties> CREATOR;
		field public final int audioCapabilities;
		field @NonNull public final String description;
		field public final int id;
		field @NonNull public final String implementor;
		field public final int maxBufferMs;
		field public final int maxKeyphrases;
		field public final int maxSoundModels;
		field public final int maxUsers;
		field public final int powerConsumptionMw;
		field public final int recognitionModes;
		field public final boolean returnsTriggerInEvent;
		field @NonNull public final String supportedModelArch;
		field public final boolean supportsCaptureTransition;
		field public final boolean supportsConcurrentCapture;
		field @NonNull public final java.util.UUID uuid;
		field public final int version;
		}

		public static class SoundTrigger.RecognitionEvent {
		@@ -3633,13 +3633,13 @@ package android.hardware.soundtrigger {
		}

		public static class SoundTrigger.SoundModel {
		method @NonNull public byte[] getData();
		method public int getType();
		method @NonNull public java.util.UUID getUuid();
		method @NonNull public java.util.UUID getVendorUuid();
		method public int getVersion();
		field public static final int TYPE_GENERIC_SOUND = 1; // 0x1
		field public static final int TYPE_KEYPHRASE = 0; // 0x0
		field @NonNull public final byte[] data;
		field public final int type;
		field @NonNull public final java.util.UUID uuid;
		field @NonNull public final java.util.UUID vendorUuid;
		field public final int version;
		}

		}

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -106,11 +106,11 @@ class ConversionUtil {

		public static SoundModel api2aidlSoundModel(SoundTrigger.SoundModel apiModel) {
		SoundModel aidlModel = new SoundModel();
		aidlModel.type = apiModel.type;
		aidlModel.uuid = api2aidlUuid(apiModel.uuid);
		aidlModel.vendorUuid = api2aidlUuid(apiModel.vendorUuid);
		aidlModel.data = byteArrayToSharedMemory(apiModel.data, "SoundTrigger SoundModel");
		aidlModel.dataSize = apiModel.data.length;
		aidlModel.type = apiModel.getType();
		aidlModel.uuid = api2aidlUuid(apiModel.getUuid());
		aidlModel.vendorUuid = api2aidlUuid(apiModel.getVendorUuid());
		aidlModel.data = byteArrayToSharedMemory(apiModel.getData(), "SoundTrigger SoundModel");
		aidlModel.dataSize = apiModel.getData().length;
		return aidlModel;
		}

		@@ -122,20 +122,20 @@ class ConversionUtil {
		SoundTrigger.KeyphraseSoundModel apiModel) {
		PhraseSoundModel aidlModel = new PhraseSoundModel();
		aidlModel.common = api2aidlSoundModel(apiModel);
		aidlModel.phrases = new Phrase[apiModel.keyphrases.length];
		for (int i = 0; i < apiModel.keyphrases.length; ++i) {
		aidlModel.phrases[i] = api2aidlPhrase(apiModel.keyphrases[i]);
		aidlModel.phrases = new Phrase[apiModel.getKeyphrases().length];
		for (int i = 0; i < apiModel.getKeyphrases().length; ++i) {
		aidlModel.phrases[i] = api2aidlPhrase(apiModel.getKeyphrases()[i]);
		}
		return aidlModel;
		}

		public static Phrase api2aidlPhrase(SoundTrigger.Keyphrase apiPhrase) {
		Phrase aidlPhrase = new Phrase();
		aidlPhrase.id = apiPhrase.id;
		aidlPhrase.recognitionModes = api2aidlRecognitionModes(apiPhrase.recognitionModes);
		aidlPhrase.users = Arrays.copyOf(apiPhrase.users, apiPhrase.users.length);
		aidlPhrase.locale = apiPhrase.locale.toLanguageTag();
		aidlPhrase.text = apiPhrase.text;
		aidlPhrase.id = apiPhrase.getId();
		aidlPhrase.recognitionModes = api2aidlRecognitionModes(apiPhrase.getRecognitionModes());
		aidlPhrase.users = Arrays.copyOf(apiPhrase.getUsers(), apiPhrase.getUsers().length);
		aidlPhrase.locale = apiPhrase.getLocale().toLanguageTag();
		aidlPhrase.text = apiPhrase.getText();
		return aidlPhrase;
		}

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

+274 −171

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -487,7 +487,7 @@ public class AlwaysOnHotwordDetector {
		ModuleProperties properties =
		mModelManagementService.getDspModuleProperties();
		if (properties != null) {
		return properties.audioCapabilities;
		return properties.getAudioCapabilities();
		}

		return 0;

media/java/android/media/soundtrigger/SoundTriggerManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ public final class SoundTriggerManager {
		*/
		@NonNull
		public UUID getModelUuid() {
		return mGenericSoundModel.uuid;
		return mGenericSoundModel.getUuid();
		}

		/**
		@@ -221,7 +221,7 @@ public final class SoundTriggerManager {
		*/
		@NonNull
		public UUID getVendorUuid() {
		return mGenericSoundModel.vendorUuid;
		return mGenericSoundModel.getVendorUuid();
		}

		/**
		@@ -230,7 +230,7 @@ public final class SoundTriggerManager {
		* @return Version associated with the model
		*/
		public int getVersion() {
		return mGenericSoundModel.version;
		return mGenericSoundModel.getVersion();
		}

		/**
		@@ -240,7 +240,7 @@ public final class SoundTriggerManager {
		*/
		@Nullable
		public byte[] getModelData() {
		return mGenericSoundModel.data;
		return mGenericSoundModel.getData();
		}

		/**
		@@ -307,7 +307,7 @@ public final class SoundTriggerManager {
		}

		try {
		switch (soundModel.type) {
		switch (soundModel.getType()) {
		case SoundModel.TYPE_GENERIC_SOUND:
		return mSoundTriggerService.loadGenericSoundModel(
		(GenericSoundModel) soundModel);