diff options
author | James Dong <jdong@google.com> | 2012-03-26 10:51:59 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2012-03-26 11:18:35 -0700 |
commit | 6e43c1b51b567e7628a4442dc76e7a0e691a67ba (patch) | |
tree | 8179ec6e1a742c38bdd624a90ff8a20aca2eb8bc /media | |
parent | a026b48972316d05a75b6dde883be39b1e046891 (diff) | |
download | frameworks_base-6e43c1b51b567e7628a4442dc76e7a0e691a67ba.zip frameworks_base-6e43c1b51b567e7628a4442dc76e7a0e691a67ba.tar.gz frameworks_base-6e43c1b51b567e7628a4442dc76e7a0e691a67ba.tar.bz2 |
Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h
o related-to-bug: 6214141
Change-Id: I548d84a9888be884d3903dc9dea9235258792165
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/TimedEventQueue.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/media/libstagefright/TimedEventQueue.cpp b/media/libstagefright/TimedEventQueue.cpp index 6d345bb..9df15eb 100644 --- a/media/libstagefright/TimedEventQueue.cpp +++ b/media/libstagefright/TimedEventQueue.cpp @@ -31,10 +31,6 @@ #include <media/stagefright/foundation/ADebug.h> -#ifdef ANDROID_SIMULATOR -#include <jni.h> -#endif - namespace android { TimedEventQueue::TimedEventQueue() @@ -193,27 +189,10 @@ int64_t TimedEventQueue::getRealTimeUs() { // static void *TimedEventQueue::ThreadWrapper(void *me) { -#ifdef ANDROID_SIMULATOR - // The simulator runs everything as one process, so any - // Binder calls happen on this thread instead of a thread - // in another process. We therefore need to make sure that - // this thread can do calls into interpreted code. - // On the device this is not an issue because the remote - // thread will already be set up correctly for this. - JavaVM *vm; - int numvms; - JNI_GetCreatedJavaVMs(&vm, 1, &numvms); - JNIEnv *env; - vm->AttachCurrentThread(&env, NULL); -#endif - androidSetThreadPriority(0, ANDROID_PRIORITY_FOREGROUND); static_cast<TimedEventQueue *>(me)->threadEntry(); -#ifdef ANDROID_SIMULATOR - vm->DetachCurrentThread(); -#endif return NULL; } |