diff options
2 files changed, 11 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java b/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java index 9b22f33a20b0..0b89646bbed1 100644 --- a/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java +++ b/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java @@ -40,7 +40,6 @@ import android.media.soundtrigger_middleware.SoundTriggerModuleProperties; import android.os.HidlMemoryUtil; import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * Utilities for type conversion between SoundTrigger HAL types and SoundTriggerMiddleware service @@ -60,7 +59,8 @@ class ConversionUtil { aidlProperties.maxSoundModels = hidlProperties.maxSoundModels; aidlProperties.maxKeyPhrases = hidlProperties.maxKeyPhrases; aidlProperties.maxUsers = hidlProperties.maxUsers; - aidlProperties.recognitionModes = hidlProperties.recognitionModes; + aidlProperties.recognitionModes = + hidl2aidlRecognitionModes(hidlProperties.recognitionModes); aidlProperties.captureTransition = hidlProperties.captureTransition; aidlProperties.maxBufferMs = hidlProperties.maxBufferMs; aidlProperties.concurrentCapture = hidlProperties.concurrentCapture; diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java b/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java index 82f32f88d3a2..f8915c06b555 100644 --- a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java +++ b/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java @@ -60,8 +60,6 @@ import android.os.IHwBinder; import android.os.IHwInterface; import android.os.RemoteException; -import androidx.test.runner.AndroidJUnit4; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -144,7 +142,11 @@ public class SoundTriggerMiddlewareImplTest { properties.maxSoundModels = 456; properties.maxKeyPhrases = 567; properties.maxUsers = 678; - properties.recognitionModes = 789; + properties.recognitionModes = + android.hardware.soundtrigger.V2_0.RecognitionMode.VOICE_TRIGGER + | android.hardware.soundtrigger.V2_0.RecognitionMode.USER_IDENTIFICATION + | android.hardware.soundtrigger.V2_0.RecognitionMode.USER_AUTHENTICATION + | android.hardware.soundtrigger.V2_0.RecognitionMode.GENERIC_TRIGGER; properties.captureTransition = true; properties.maxBufferMs = 321; properties.concurrentCapture = supportConcurrentCapture; @@ -162,7 +164,10 @@ public class SoundTriggerMiddlewareImplTest { assertEquals(456, properties.maxSoundModels); assertEquals(567, properties.maxKeyPhrases); assertEquals(678, properties.maxUsers); - assertEquals(789, properties.recognitionModes); + assertEquals(RecognitionMode.GENERIC_TRIGGER + | RecognitionMode.USER_AUTHENTICATION + | RecognitionMode.USER_IDENTIFICATION + | RecognitionMode.VOICE_TRIGGER, properties.recognitionModes); assertTrue(properties.captureTransition); assertEquals(321, properties.maxBufferMs); assertEquals(supportConcurrentCapture, properties.concurrentCapture); |