diff options
author | Julian Kast <julian@livio.com> | 2021-03-11 16:21:14 -0500 |
---|---|---|
committer | Julian Kast <julian@livio.com> | 2021-03-11 16:21:14 -0500 |
commit | 4d8fb85a5682e94533b906ccc62756a82472c8f0 (patch) | |
tree | 63f0e3affc9c04e13a19a0581cdce30567c15f35 | |
parent | 4fb1f708e5f6561deb52d0ce01571377bb8b53ed (diff) | |
download | sdl_android-bugfix/issue_1630_fix_choice_set_default_timeout.tar.gz |
Fix choiceSet default timeoutbugfix/issue_1630_fix_choice_set_default_timeout
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java index 58b1e41f6..37c6300bf 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java @@ -303,7 +303,7 @@ public class ChoiceSet { */ public Integer getTimeout() { if (timeout == null) { - timeout = defaultTimeout; + timeout = getDefaultTimeout(); } else if (timeout < TIMEOUT_MIN) { return TIMEOUT_MIN; } else if (timeout > TIMEOUT_MAX) { @@ -323,9 +323,9 @@ public class ChoiceSet { public int getDefaultTimeout() { if (defaultTimeout < TIMEOUT_MIN) { - this.defaultTimeout = TIMEOUT_MIN; + return TIMEOUT_MIN; } else if (defaultTimeout > TIMEOUT_MAX) { - this.defaultTimeout = TIMEOUT_MAX; + return TIMEOUT_MAX; } return defaultTimeout; } |