From f3a9f021e23a5e629d9c28543b0765d90eb25168 Mon Sep 17 00:00:00 2001
From: jiaoyuan <jiaoyuan@codeaurora.org>
Date: Thu, 4 Jun 2020 14:54:50 +0800
Subject: [PATCH] Snapcam: fix memory leak issue
WatchdogThread is not stoped, kill it
Change-Id: I112529be982fc9ae4513b90eb3611808819645e6
---
src/com/android/camera/CaptureModule.java | 2 ++
src/com/android/camera/imageprocessor/PostProcessor.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index ff4a5d55b..a5ae48c35 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -4276,6 +4276,8 @@ public class CaptureModule implements CameraModule, PhotoController,
closeCamera();
mUI.showPreviewCover();
mUI.hideSurfaceView();
+ }else{
+ closeProcessors();
}
resetAudioMute();
mUI.releaseSoundPool();
diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java
index 4588e5504..400e04b00 100755
--- a/src/com/android/camera/imageprocessor/PostProcessor.java
+++ b/src/com/android/camera/imageprocessor/PostProcessor.java
@@ -784,6 +784,7 @@ public class PostProcessor{
mSavingHander = new ProcessorHandler(mSavingHandlerThread.getLooper());
mWatchdog = new WatchdogThread();
+ Log.i(TAG,"start watch dog");
mWatchdog.start();
}
@@ -869,6 +870,7 @@ public class PostProcessor{
mSavingHandlerThread = null;
mSavingHander = null;
}
+ Log.i(TAG,"stop watch dog, " + mWatchdog);
if(mWatchdog != null) {
mWatchdog.kill();
mWatchdog = null;
--
GitLab