Merge branch 'feature/issue_840_cancel_interaction_RPC' of https://github.com/NicoleYarroch/sdl_android into feature/issue_840_cancel_interaction_RPC

2 files changed, 4 insertions, 4 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 7fc02f93d..353068388 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
@@ -420,11 +420,11 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
      *
      *  This will only dismiss an already presented keyboard if connected to head units running SDL 6.0+.
      *
-     * @param cancelID - The unique ID assigned to the keyboard, passed as the return value from `presentKeyboardWithInitialText:keyboardDelegate:`
+     * @param cancelID - The unique ID assigned to the keyboard, passed as the return value from `presentKeyboard`
      */
     public void dismissKeyboard(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() == cancelID) {
+        if (currentlyPresentedKeyboardOperation != null && currentlyPresentedKeyboardOperation.getCancelID().equals(cancelID)) {
             currentlyPresentedKeyboardOperation.dismissKeyboard();
             return;
         }
@@ -434,7 +434,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
             if (!(operation instanceof PresentKeyboardOperation)){ continue; }
 
             PresentKeyboardOperation pendingOp = (PresentKeyboardOperation) operation;
-            if (!(pendingOp.getCancelID() == cancelID)) { continue; }
+            if (!(pendingOp.getCancelID().equals(cancelID))) { continue; }
 
             pendingOp.dismissKeyboard();
             break;
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
index d20635115..a3bb9a567 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
@@ -86,7 +86,7 @@ import java.util.List;
  * 		<tr>

  * 			<td>cancelID</td>

  * 			<td>Integer</td>

- * 			<td>An ID for this specific alert to allow cancellation through the `CancelInteraction` RPC.</td>

+ * 			<td>An ID for this specific ScrollableMessage to allow cancellation through the `CancelInteraction` RPC.</td>

  *          <td>N</td>

  * 			<td></td>

  * 			<td>SmartDeviceLink 6.0</td>