commit 4f3d8106cf1ebaa66409b509c0258d95867be1a6
author Nicholas Ambur <nambur@google.com> Thu Oct 15 16:15:42 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 15 16:15:42 2020 +0000
tree 81526d721ec7065744821d99c46ca6f0745c598b
parent aa07d3c6ef3751e09d6eec4e608f494f27a329d0
parent cf2c26473685f34177acda2b0b5263331777434c

Merge "fix return behavior of deleteKeyphraseSoundModel"

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

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index 917f65a..547d253 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -1048,9 +1048,9 @@
                     if (unloadStatus != SoundTriggerInternal.STATUS_OK) {
                         Slog.w(TAG, "Unable to unload keyphrase sound model:" + unloadStatus);
                     }
-                    deleted = mDbHelper.deleteKeyphraseSoundModel(keyphraseId, callingUserId,
-                            bcp47Locale);
                 }
+                deleted = mDbHelper.deleteKeyphraseSoundModel(keyphraseId, callingUserId,
+                        bcp47Locale);
                 return deleted ? SoundTriggerInternal.STATUS_OK : SoundTriggerInternal.STATUS_ERROR;
             } finally {
                 if (deleted) {