Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix calling SoundTriggerMiddleware in safeMode" into rvc-dev am: de1f26432c am: 3299b363d2 am: 9ca1051114 am: 733e2ce884

Browse Source 
Change-Id: I265d732fdbd5a18385caed49043309525e618263
This commit is contained in:
Nicholas Ambur
2020-05-18 23:37:08 +00:00
committed by Automerger Merge Worker
parent 21884f1f8e 733e2ce884
commit 62d2543199
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
View File

@@ -346,12 +346,15 @@ public class SoundTriggerService extends SystemService {
sEventLogger.log(new SoundTriggerLogger.StringEvent("deleteSoundModel(): id = "
+ soundModelId));
// Unload the model if it is loaded.
mSoundTriggerHelper.unloadGenericSoundModel(soundModelId.getUuid());
mDbHelper.deleteGenericSoundModel(soundModelId.getUuid());
if (isInitialized()) {
// Unload the model if it is loaded.
mSoundTriggerHelper.unloadGenericSoundModel(soundModelId.getUuid());
// Stop recognition if it is started.
mSoundModelStatTracker.onStop(soundModelId.getUuid());
// Stop tracking recognition if it is started.
mSoundModelStatTracker.onStop(soundModelId.getUuid());
}
mDbHelper.deleteGenericSoundModel(soundModelId.getUuid());
}
@Override