From 76df79777352b7ed98a003e6d038ad4e17727eff Mon Sep 17 00:00:00 2001 From: Atneya Nair Date: Mon, 23 Jan 2023 12:24:10 -0800 Subject: [PATCH] Move SoundTriggerMiddleware to VoiceInteraction In preparation for merging STMiddleware with STService, relocate STMiddleware to services.voiceinteraction. Test: Compiles Change-Id: If103b4c63417fb170629414a17bd283088621536 --- .../server/soundtrigger_middleware/ConversionUtilTest.java | 0 .../src/com/android/server/soundtrigger_middleware/OWNERS | 0 .../server/soundtrigger_middleware/SoundHw2CompatTest.java | 0 .../SoundTriggerHalConcurrentCaptureHandlerTest.java | 0 .../soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java | 0 .../src/com/android/server/soundtrigger_middleware/TestUtil.java | 0 .../android/server/soundtrigger_middleware/UptimeTimerTest.java | 0 .../java/com/android/server/soundtrigger_middleware/AidlUtil.java | 0 .../server/soundtrigger_middleware/AudioSessionProviderImpl.java | 0 .../android/server/soundtrigger_middleware/ConversionUtil.java | 0 .../android/server/soundtrigger_middleware/DefaultHalFactory.java | 0 .../java/com/android/server/soundtrigger_middleware/Dumpable.java | 0 .../soundtrigger_middleware/ExternalCaptureStateTracker.java | 0 .../com/android/server/soundtrigger_middleware/HalException.java | 0 .../com/android/server/soundtrigger_middleware/HalFactory.java | 0 .../com/android/server/soundtrigger_middleware/Hw2CompatUtil.java | 0 .../server/soundtrigger_middleware/ICaptureStateNotifier.java | 0 .../android/server/soundtrigger_middleware/ISoundTriggerHal.java | 0 .../soundtrigger_middleware/ISoundTriggerMiddlewareInternal.java | 0 .../java/com/android/server/soundtrigger_middleware/OWNERS | 0 .../com/android/server/soundtrigger_middleware/ObjectPrinter.java | 0 .../java/com/android/server/soundtrigger_middleware/README.md | 0 .../server/soundtrigger_middleware/RecoverableException.java | 0 .../SoundTriggerHalConcurrentCaptureHandler.java | 0 .../server/soundtrigger_middleware/SoundTriggerHalEnforcer.java | 0 .../soundtrigger_middleware/SoundTriggerHalMaxModelLimiter.java | 0 .../server/soundtrigger_middleware/SoundTriggerHalWatchdog.java | 0 .../server/soundtrigger_middleware/SoundTriggerHw2Compat.java | 0 .../server/soundtrigger_middleware/SoundTriggerHw3Compat.java | 0 .../soundtrigger_middleware/SoundTriggerMiddlewareImpl.java | 0 .../soundtrigger_middleware/SoundTriggerMiddlewareLogging.java | 0 .../soundtrigger_middleware/SoundTriggerMiddlewarePermission.java | 0 .../soundtrigger_middleware/SoundTriggerMiddlewareService.java | 0 .../soundtrigger_middleware/SoundTriggerMiddlewareValidation.java | 0 .../server/soundtrigger_middleware/SoundTriggerModule.java | 0 .../java/com/android/server/soundtrigger_middleware/TEST_MAPPING | 0 .../com/android/server/soundtrigger_middleware/UptimeTimer.java | 0 .../java/com/android/server/soundtrigger_middleware/UuidUtil.java | 0 .../android/server/soundtrigger_middleware/ValidationUtil.java | 0 39 files changed, 0 insertions(+), 0 deletions(-) rename services/tests/{servicestests => voiceinteractiontests}/src/com/android/server/soundtrigger_middleware/ConversionUtilTest.java (100%) rename services/tests/{servicestests => voiceinteractiontests}/src/com/android/server/soundtrigger_middleware/OWNERS (100%) rename services/tests/{servicestests => voiceinteractiontests}/src/com/android/server/soundtrigger_middleware/SoundHw2CompatTest.java (100%) rename services/tests/{servicestests => voiceinteractiontests}/src/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandlerTest.java (100%) rename services/tests/{servicestests => voiceinteractiontests}/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java (100%) rename services/tests/{servicestests => voiceinteractiontests}/src/com/android/server/soundtrigger_middleware/TestUtil.java (100%) rename services/tests/{servicestests => voiceinteractiontests}/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/AidlUtil.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/AudioSessionProviderImpl.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/ConversionUtil.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/DefaultHalFactory.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/Dumpable.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/ExternalCaptureStateTracker.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/HalException.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/HalFactory.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/Hw2CompatUtil.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/ICaptureStateNotifier.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/ISoundTriggerHal.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/ISoundTriggerMiddlewareInternal.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/OWNERS (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/ObjectPrinter.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/README.md (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/RecoverableException.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandler.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerHalEnforcer.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerHalMaxModelLimiter.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerHalWatchdog.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerHw2Compat.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImpl.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLogging.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareService.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareValidation.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/SoundTriggerModule.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/TEST_MAPPING (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/UptimeTimer.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/UuidUtil.java (100%) rename services/{core => voiceinteraction}/java/com/android/server/soundtrigger_middleware/ValidationUtil.java (100%) diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/ConversionUtilTest.java b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/ConversionUtilTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/soundtrigger_middleware/ConversionUtilTest.java rename to services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/ConversionUtilTest.java diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/OWNERS b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/OWNERS similarity index 100% rename from services/tests/servicestests/src/com/android/server/soundtrigger_middleware/OWNERS rename to services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/OWNERS diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundHw2CompatTest.java b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundHw2CompatTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundHw2CompatTest.java rename to services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundHw2CompatTest.java diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandlerTest.java b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandlerTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandlerTest.java rename to services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandlerTest.java diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java rename to services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImplTest.java diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/TestUtil.java b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/TestUtil.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/soundtrigger_middleware/TestUtil.java rename to services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/TestUtil.java diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java rename to services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/AidlUtil.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/AidlUtil.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/AidlUtil.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/AidlUtil.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/AudioSessionProviderImpl.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/AudioSessionProviderImpl.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/AudioSessionProviderImpl.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/AudioSessionProviderImpl.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ConversionUtil.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ConversionUtil.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/DefaultHalFactory.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/DefaultHalFactory.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/DefaultHalFactory.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/DefaultHalFactory.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/Dumpable.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/Dumpable.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/Dumpable.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/Dumpable.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ExternalCaptureStateTracker.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ExternalCaptureStateTracker.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/ExternalCaptureStateTracker.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ExternalCaptureStateTracker.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/HalException.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/HalException.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/HalException.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/HalException.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/HalFactory.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/HalFactory.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/HalFactory.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/HalFactory.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/Hw2CompatUtil.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/Hw2CompatUtil.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/Hw2CompatUtil.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/Hw2CompatUtil.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ICaptureStateNotifier.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ICaptureStateNotifier.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/ICaptureStateNotifier.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ICaptureStateNotifier.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ISoundTriggerHal.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ISoundTriggerHal.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/ISoundTriggerHal.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ISoundTriggerHal.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ISoundTriggerMiddlewareInternal.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ISoundTriggerMiddlewareInternal.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/ISoundTriggerMiddlewareInternal.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ISoundTriggerMiddlewareInternal.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/OWNERS b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/OWNERS similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/OWNERS rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/OWNERS diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ObjectPrinter.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ObjectPrinter.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/ObjectPrinter.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ObjectPrinter.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/README.md b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/README.md similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/README.md rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/README.md diff --git a/services/core/java/com/android/server/soundtrigger_middleware/RecoverableException.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/RecoverableException.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/RecoverableException.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/RecoverableException.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandler.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandler.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandler.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHalConcurrentCaptureHandler.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHalEnforcer.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHalEnforcer.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHalEnforcer.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHalEnforcer.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHalMaxModelLimiter.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHalMaxModelLimiter.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHalMaxModelLimiter.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHalMaxModelLimiter.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHalWatchdog.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHalWatchdog.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHalWatchdog.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHalWatchdog.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw2Compat.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHw2Compat.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw2Compat.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHw2Compat.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImpl.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImpl.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImpl.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareImpl.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLogging.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLogging.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLogging.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLogging.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareService.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareService.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareService.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareService.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareValidation.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareValidation.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareValidation.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareValidation.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerModule.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerModule.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerModule.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerModule.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/TEST_MAPPING b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/TEST_MAPPING similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/TEST_MAPPING rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/TEST_MAPPING diff --git a/services/core/java/com/android/server/soundtrigger_middleware/UptimeTimer.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/UptimeTimer.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/UptimeTimer.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/UptimeTimer.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/UuidUtil.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/UuidUtil.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/UuidUtil.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/UuidUtil.java diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ValidationUtil.java b/services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ValidationUtil.java similarity index 100% rename from services/core/java/com/android/server/soundtrigger_middleware/ValidationUtil.java rename to services/voiceinteraction/java/com/android/server/soundtrigger_middleware/ValidationUtil.java