diff options
author | Robert Henigan <robert.henigan@livio.io> | 2020-07-07 16:05:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-07 16:05:48 -0400 |
commit | 1f7cac98fe4ea6b15b2fb8bcc2ed477e8a6adf8a (patch) | |
tree | 3d47ced4ed20d1bb10a2bca84f67222dad1e9c98 | |
parent | b8e55a503d54e313d1a065b366c01f5f72e4bd91 (diff) | |
parent | ec008966d86894eab40b43b70d7751d25de46caa (diff) | |
download | sdl_android-1f7cac98fe4ea6b15b2fb8bcc2ed477e8a6adf8a.tar.gz |
Merge pull request #1405 from smartdevicelink/PreloadChoiceSetError
Choice Set Error
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java index 6d8423027..de68e1ffc 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java @@ -73,6 +73,7 @@ class PreloadChoicesOperation extends Task { private CompletionListener completionListener; private boolean isRunning; private boolean isVROptional; + private boolean choiceError = false; PreloadChoicesOperation(ISdl internalInterface, FileManager fileManager, String displayName, WindowCapability defaultMainWindowCapability, Boolean isVROptional, HashSet<ChoiceCell> cellsToPreload, CompletionListener listener){ @@ -164,16 +165,15 @@ class PreloadChoicesOperation extends Task { public void onFinished() { isRunning = false; DebugTool.logInfo(TAG, "Finished pre loading choice cells"); - completionListener.onComplete(true); - + completionListener.onComplete(!choiceError); + choiceError = false; PreloadChoicesOperation.super.onFinished(); } @Override public void onError(int correlationId, Result resultCode, String info) { DebugTool.logError(TAG, "There was an error uploading a choice cell: "+ info + " resultCode: " + resultCode); - - PreloadChoicesOperation.super.onFinished(); + choiceError = true; } @Override |