summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicoleYarroch <nicole@livio.io>2019-08-14 12:12:10 -0400
committerNicoleYarroch <nicole@livio.io>2019-08-14 12:12:10 -0400
commitd63b9efe73c08fca84bae72c6a36bb02ea822f60 (patch)
tree6fa7bd9c526ce52f6a40ac295b2ce3bdf2965dbd
parenteb32ae3570f9dda2271a31b9e429990008380906 (diff)
downloadsdl_android-d63b9efe73c08fca84bae72c6a36bb02ea822f60.tar.gz
Added nullable to `presentKeyboard()` return value
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java2
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java2
-rw-r--r--base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
index 04e1bcde2..5ce6520eb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
@@ -62,7 +62,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
public class ChoiceSetManagerTests extends AndroidTestCase2 {
-
+
private ChoiceSetManager csm;
@Override
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
index 3d532ce82..867a7584c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
@@ -25,7 +25,7 @@ import java.util.List;
* This is a unit test class for the SmartDeviceLink library project class :
* {@link com.smartdevicelink.proxy.rpc.Alert}
*/
-public class AlertTests extends BaseRpcTests {
+public class AlertTests extends BaseRpcTests{
@Override
protected RPCMessage createMessage(){
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 4884b0b7d..0ab4045a2 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
@@ -535,7 +535,7 @@ abstract class BaseScreenManager extends BaseSubManager {
* @param customKeyboardProperties - the custom keyboard configuration to be used when the keyboard is displayed
* @return A unique cancelID that can be used to cancel this keyboard. If `null`, no keyboard was created.
*/
- public Integer presentKeyboard(@NonNull String initialText, @NonNull KeyboardListener keyboardListener, @Nullable KeyboardProperties customKeyboardProperties){
+ public @Nullable Integer presentKeyboard(@NonNull String initialText, @NonNull KeyboardListener keyboardListener, @Nullable KeyboardProperties customKeyboardProperties){
return this.choiceSetManager.presentKeyboard(initialText, keyboardListener, customKeyboardProperties);
}