Add uniqueness check back to ChoiceSetManager

Author: Henigan

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java

@@ -590,10 +590,13 @@ boolean setUpChoiceSet(ChoiceSet choiceSet) {
         }
 
         HashSet<String> uniqueVoiceCommands = new HashSet<>();
+        HashSet<ChoiceCell> uniqueChoiceCells = new HashSet<>();
+
         int allVoiceCommandsCount = 0;
         int choiceCellWithVoiceCommandCount = 0;
 
         for (ChoiceCell cell : choices) {
+            uniqueChoiceCells.add(cell);
             // Not using cloned cell here because we set the clone's VoiceCommands to null for visual check only
             if (cell.getVoiceCommands() != null) {
                 uniqueVoiceCommands.addAll(cell.getVoiceCommands());
@@ -602,6 +605,11 @@ boolean setUpChoiceSet(ChoiceSet choiceSet) {
             }
         }
 
+        if (uniqueChoiceCells.size() != choices.size()) {
+            DebugTool.logError(TAG, "Attempted to create a choice set with a duplicate cell. Cell must have a unique value other than its primary text. The choice set will not be set.");
+            return false;
+        }
+
         // All or none of the choices MUST have VR Commands
         if (choiceCellWithVoiceCommandCount > 0 && choiceCellWithVoiceCommandCount < choices.size()) {
             DebugTool.logError(TAG, "If using voice recognition commands, all of the choice set cells must have unique VR commands. There are " + uniqueVoiceCommands.size() + " cells with unique voice commands and " + choices.size() + " total cells. The choice set will not be set.");