Merge "Limit GetModelState API to generic sound models (ie music detector)" into qt-dev

This commit is contained in:
Michael Dooley
2019-05-24 05:37:10 +00:00
committed by Android (Google) Code Review

View File

@@ -558,18 +558,15 @@ public class SoundTriggerService extends SystemService {
return ret; return ret;
} }
switch (soundModel.type) { switch (soundModel.type) {
case SoundModel.TYPE_KEYPHRASE:
ret = mSoundTriggerHelper.getKeyphraseModelState(soundModel.uuid);
break;
case SoundModel.TYPE_GENERIC_SOUND: case SoundModel.TYPE_GENERIC_SOUND:
ret = mSoundTriggerHelper.getGenericModelState(soundModel.uuid); ret = mSoundTriggerHelper.getGenericModelState(soundModel.uuid);
break; break;
default: default:
Slog.e(TAG, "Unknown model type"); // SoundModel.TYPE_KEYPHRASE is not supported to increase privacy.
Slog.e(TAG, "Unsupported model type, " + soundModel.type);
sEventLogger.log(new SoundTriggerLogger.StringEvent( sEventLogger.log(new SoundTriggerLogger.StringEvent(
"getModelState(): Unknown model type")); "getModelState(): Unsupported model type, "
+ soundModel.type));
break; break;
} }