diff options
author | NicoleYarroch <nicole@livio.io> | 2019-08-21 08:49:15 -0400 |
---|---|---|
committer | NicoleYarroch <nicole@livio.io> | 2019-08-21 08:49:15 -0400 |
commit | 29a3c18c0368973d0500bb2ea785d0acdbb59ad5 (patch) | |
tree | 9b59ca06a2a51babc700c28e5e7d2c8cd51f7bff | |
parent | 812b3e723c468e577879828a872f270803ce8e1d (diff) | |
download | sdl_android-29a3c18c0368973d0500bb2ea785d0acdbb59ad5.tar.gz |
dismissKeyboard() now takes a nonnull Integer
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java | 2 | ||||
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java index 102420375..627c85fcb 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java @@ -547,7 +547,7 @@ abstract class BaseScreenManager extends BaseSubManager { * Dismisses a currently presented keyboard with the associated ID. Canceling a keyboard only works when connected to SDL Core v.6.0+. When connected to older versions of SDL Core the keyboard will not be dismissed. * @param cancelID The unique ID assigned to the keyboard */ - public void dismissKeyboard(Integer cancelID) { + public void dismissKeyboard(@NonNull Integer cancelID) { this.choiceSetManager.dismissKeyboard(cancelID); } 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 353068388..f55678a47 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 @@ -422,7 +422,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager { * * @param cancelID - The unique ID assigned to the keyboard, passed as the return value from `presentKeyboard` */ - public void dismissKeyboard(Integer cancelID) { + public void dismissKeyboard(@NonNull Integer cancelID) { // First, attempt to cancel the currently executing keyboard operation (Once an operation has started it is removed from the operationQueue) if (currentlyPresentedKeyboardOperation != null && currentlyPresentedKeyboardOperation.getCancelID().equals(cancelID)) { currentlyPresentedKeyboardOperation.dismissKeyboard(); |