Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: trunk/src/content/browser/renderer_host/media/audio_input_sync_writer.cc

Issue 291173006: Revert 271764 "Detaching from the VM after calling MediaStreamMa..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/renderer_host/media/audio_input_sync_writer.cc
===================================================================
--- trunk/src/content/browser/renderer_host/media/audio_input_sync_writer.cc (revision 271787)
+++ trunk/src/content/browser/renderer_host/media/audio_input_sync_writer.cc (working copy)
@@ -6,9 +6,6 @@
#include <algorithm>
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#endif
#include "base/memory/shared_memory.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
@@ -53,19 +50,9 @@
<< interval.InMilliseconds() << "ms.";
}
}
- if (!oss.str().empty()) {
+ if (!oss.str().empty())
MediaStreamManager::SendMessageToNativeLog(oss.str());
- // MediaStreamManager::SendMessageToNativeLog posts a task to the UI thread,
- // which will attach the audio thread to the Android java VM. Unlike chrome
- // created threads, the audio thread is owned by the OS and does not detach
- // itself from the VM on exit, causing a crash (crbug/365915). So we detach
- // here to make sure the thread exits clean.
-#if defined(OS_ANDROID)
- base::android::DetachFromVM();
-#endif
- }
-
last_write_time_ = base::Time::Now();
uint8* ptr = static_cast<uint8*>(shared_memory_->memory());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698