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

1 files 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 9c4c0998b21a..7a834696387c 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;
                 }