Merge "fix return behavior of deleteKeyphraseSoundModel"

This commit is contained in:
Nicholas Ambur
2020-10-15 16:15:42 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
}
deleted = mDbHelper.deleteKeyphraseSoundModel(keyphraseId, callingUserId,
bcp47Locale);
return deleted ? SoundTriggerInternal.STATUS_OK : SoundTriggerInternal.STATUS_ERROR;
} finally {
if (deleted) {