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

Co-authored-by: Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
index 8e8352956..e83c4ef33 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
@@ -453,7 +453,11 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
      * @param keyboardConfiguration - the custom keyboard configuration to be used when the keyboard is displayed
      */
     public void setKeyboardConfiguration(@Nullable KeyboardProperties keyboardConfiguration) {
-        processKeyboardConfiguration(keyboardConfiguration);
+     if (keyboardConfiguration == null) {
+            this.keyboardConfiguration = defaultKeyboardConfiguration();
+        } else {
+            this.keyboardConfiguration = createValidKeyboardConfigurationBasedOnKeyboardCapabilitiesFromConfiguration(keyboardConfiguration);
+        }
     }
 
     private KeyboardProperties processKeyboardConfiguration(@Nullable KeyboardProperties keyboardConfiguration) {