Merge "fix calling SoundTriggerMiddleware in safeMode" into rvc-dev am: de1f26432c am: 19610927e0 (651fc05a) · Commits · e / os / android_frameworks_base

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -346,14 +346,17 @@ public class SoundTriggerService extends SystemService {
	sEventLogger.log(new SoundTriggerLogger.StringEvent("deleteSoundModel(): id = "		sEventLogger.log(new SoundTriggerLogger.StringEvent("deleteSoundModel(): id = "
	+ soundModelId));		+ soundModelId));

			if (isInitialized()) {
	// Unload the model if it is loaded.		// Unload the model if it is loaded.
	mSoundTriggerHelper.unloadGenericSoundModel(soundModelId.getUuid());		mSoundTriggerHelper.unloadGenericSoundModel(soundModelId.getUuid());
	mDbHelper.deleteGenericSoundModel(soundModelId.getUuid());

	// Stop recognition if it is started.		// Stop tracking recognition if it is started.
	mSoundModelStatTracker.onStop(soundModelId.getUuid());		mSoundModelStatTracker.onStop(soundModelId.getUuid());
	}		}

			mDbHelper.deleteGenericSoundModel(soundModelId.getUuid());
			}

	@Override		@Override
	public int loadGenericSoundModel(GenericSoundModel soundModel) {		public int loadGenericSoundModel(GenericSoundModel soundModel) {
	enforceCallingPermission(Manifest.permission.MANAGE_SOUND_TRIGGER);		enforceCallingPermission(Manifest.permission.MANAGE_SOUND_TRIGGER);