Merge pull request #1176 from smartdevicelink/bugfix/issue_1172

Dispose main underlying layers when sdlManager is disposed

2 files changed, 12 insertions, 0 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
index b4b66bfc5..a12b5d154 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -364,6 +364,14 @@ public class SdlManager extends BaseSdlManager{
 			this.audioStreamManager.dispose();
 		}
 
+		if (this.proxy != null) {
+			try {
+				this.proxy.dispose();
+			} catch (SdlException e) {
+				DebugTool.logError("Issue disposing proxy in SdlManager", e);
+			}
+		}
+
 		if(managerListener != null){
 			managerListener.onDestroy();
 			managerListener = null;
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
index 11eaaa852..99e29a109 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -299,6 +299,10 @@ public class SdlManager extends BaseSdlManager{
 			this.screenManager.dispose();
 		}
 
+		if (this.lifecycleManager != null) {
+			this.lifecycleManager.stop();
+		}
+
 		if(managerListener != null){
 			managerListener.onDestroy(this);
 			managerListener = null;