diff options
| author | Julian Kast <Julian.kast@livio.io> | 2020-10-01 13:36:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 13:36:41 -0400 |
| commit | ed26df2fa44212483400637305e70c2ea2561fb7 (patch) | |
| tree | 3041abd35ac29af21b111c15abf52fc8b8d163f8 | |
| parent | 0a5968b6308bc71f6dc70c0770a1f2ab572bc174 (diff) | |
| parent | fbed7f5e1893e17652b3e139501d618cd59d4e74 (diff) | |
| download | sdl_android-ed26df2fa44212483400637305e70c2ea2561fb7.tar.gz | |
Merge pull request #1519 from smartdevicelink/bugfix/restart_taskmaster
Reset taskmaster when LifecycleManager recycles
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java index 4df572f47..8a8487178 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -162,6 +162,7 @@ abstract class BaseLifecycleManager { } if (taskmaster != null) { taskmaster.shutdown(); + taskmaster = null; } } @@ -1111,6 +1112,10 @@ abstract class BaseLifecycleManager { if (encryptionLifecycleManager != null) { encryptionLifecycleManager.dispose(); } + if (taskmaster != null) { + taskmaster.shutdown(); + taskmaster = null; + } } /** |