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

Commit 4f3d8106 authored by Nicholas Ambur's avatar Nicholas Ambur Committed by Android (Google) Code Review
Browse files

Merge "fix return behavior of deleteKeyphraseSoundModel"

parents aa07d3c6 cf2c2647

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1048,9 +1048,9 @@ public class VoiceInteractionManagerService extends SystemService { 
                    if (unloadStatus != SoundTriggerInternal.STATUS_OK) {

                        Slog.w(TAG, "Unable to unload keyphrase sound model:" + unloadStatus);

                    }

                }

                deleted = mDbHelper.deleteKeyphraseSoundModel(keyphraseId, callingUserId,

                        bcp47Locale);

                }

                return deleted ? SoundTriggerInternal.STATUS_OK : SoundTriggerInternal.STATUS_ERROR;

            } finally {

                if (deleted) {