Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dc7736c authored by Michael Dooley's avatar Michael Dooley Committed by android-build-merger
Browse files

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

am: 58ac2ae2

Change-Id: I3c44bbfff4971431af726fe9aabcfe6e179639e6
parents 4532abd4 58ac2ae2

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

+4 −7
Original line number Diff line number Diff line
@@ -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;

                }