From 5d9ec7585ad39f73690fddbd864f3e3f5c1bde4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Rydh=C3=A9?= <oscar.rydhe@sonyericsson.com>
Date: Thu, 29 Dec 2011 13:57:04 +0100
Subject: Stop thread before deleting object reference

If setPeriodicCapture is called Visualizer will start a thread
and do periodic callbacks. When native_finalize is called the
reference to the class is deleted. If a callback happens after
this the reference is no longer valid and when used from the
callback method the vm crashes. With this patch the thread will
be terminated before deleting the reference.

Change-Id: I30f331437ddad05f8d52c244cdbecb1859a0abd2
---
 media/libmedia/Visualizer.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'media/libmedia')

diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp
index f5c1b1f..8d83c1b 100644
--- a/media/libmedia/Visualizer.cpp
+++ b/media/libmedia/Visualizer.cpp
@@ -94,6 +94,14 @@ status_t Visualizer::setEnabled(bool enabled)
     return status;
 }
 
+void Visualizer::cancelCaptureCallBack()
+{
+    sp<CaptureThread> t = mCaptureThread;
+    if (t != 0) {
+        t->requestExitAndWait();
+    }
+}
+
 status_t Visualizer::setCaptureCallBack(capture_cbk_t cbk, void* user, uint32_t flags,
         uint32_t rate, bool force)
 {
-- 
cgit v1.1