diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-03-03 10:03:14 -0500 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-03-03 10:03:14 -0500 |
| commit | 0c0237bbd5a51708d5bae75cc373908d5139d041 (patch) | |
| tree | 3bea3d871efb38c76616bd3ac2593c79c39af7d0 | |
| parent | fe702eb03854c722d465466f25256e4873d3b8eb (diff) | |
| download | sdl_android-bugfix/issue_1293.tar.gz | |
Check NPE in setVoiceCommands()bugfix/issue_1293
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java index ebffcc634..731504735 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java @@ -126,7 +126,10 @@ abstract class BaseVoiceCommandManager extends BaseSubManager { waitingOnHMIUpdate = false; lastVoiceCommandId = voiceCommandIdMin; updateIdsOnVoiceCommands(voiceCommands); - this.oldVoiceCommands = new ArrayList<>(this.voiceCommands); + this.oldVoiceCommands = new ArrayList<>(); + if (this.voiceCommands != null && !this.voiceCommands.isEmpty()) { + this.oldVoiceCommands.addAll(this.voiceCommands); + } this.voiceCommands = new ArrayList<>(voiceCommands); update(); |