From baa22c7a8f5b0abda28b7b264b63a631ab2dc44b Mon Sep 17 00:00:00 2001 From: mike dooley Date: Wed, 15 May 2019 10:05:25 +0200 Subject: [PATCH] Limit GetModelState API to generic sound models (ie music detector) This limitation is being added to increase privacy protection. Bug: 70619678 Bug: 117213117 Test: built android Change-Id: Ic6ceed60a9687204fc7bf440becaa344a42d8e74 --- .../server/soundtrigger/SoundTriggerService.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java index 9c4c0998b21a3..7a834696387c1 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java @@ -558,18 +558,15 @@ public class SoundTriggerService extends SystemService { return ret; } switch (soundModel.type) { - case SoundModel.TYPE_KEYPHRASE: - ret = mSoundTriggerHelper.getKeyphraseModelState(soundModel.uuid); - break; case SoundModel.TYPE_GENERIC_SOUND: ret = mSoundTriggerHelper.getGenericModelState(soundModel.uuid); break; 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( - "getModelState(): Unknown model type")); - + "getModelState(): Unsupported model type, " + + soundModel.type)); break; }