diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-08-23 11:56:58 -0400 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-08-23 11:56:58 -0400 |
commit | 05fa8738db4276578ad497b873b60e1626c2b772 (patch) | |
tree | a7ba7caf3d6b23cd9ec0fb6867c463d0735d0c43 | |
parent | 69a493d0af16ad6560d15d51f4ac04cc577b38d3 (diff) | |
download | sdl_android-05fa8738db4276578ad497b873b60e1626c2b772.tar.gz |
Avoid interrupting thread when canceling operations
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java | 6 |
1 files changed, 3 insertions, 3 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 c936548ba..edd775dc1 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 @@ -259,7 +259,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager { } if (pendingPresentOperation != null && !pendingPresentOperation.isCancelled() && !pendingPresentOperation.isDone() && (cellsToBeDeleted.retainAll(pendingPresentationChoices) || cellsToBeRemovedFromPending.retainAll(pendingPresentationChoices))){ - pendingPresentOperation.cancel(true); + pendingPresentOperation.cancel(false); DebugTool.logWarning("Attempting to delete choice cells while there is a pending presentation operation. Pending presentation cancelled."); pendingPresentOperation = null; } @@ -305,7 +305,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager { if (!setUpChoiceSet(choiceSet)){ return; } if (this.pendingPresentationSet != null && pendingPresentOperation != null){ - pendingPresentOperation.cancel(true); + pendingPresentOperation.cancel(false); DebugTool.logWarning("Presenting a choice set while one is currently presented. Cancelling previous and continuing"); } @@ -382,7 +382,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager { if (!isReady()){ return null; } if (pendingPresentationSet != null && pendingPresentOperation != null){ - pendingPresentOperation.cancel(true); + pendingPresentOperation.cancel(false); pendingPresentationSet = null; DebugTool.logWarning("There is a current or pending choice set, cancelling and continuing."); } |