Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76cbe0eb authored by Nicholas Ambur's avatar Nicholas Ambur Committed by Android (Google) Code Review
Browse files

Merge "fix sanitize soundtrigger hidl properties"

parents 6b913b90 ff12557f

services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java

+9 −4
Original line number Diff line number Diff line
@@ -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);