diff options
| author | San Mehat <san@google.com> | 2009-09-10 16:21:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-10 16:21:48 -0700 |
| commit | 83674b720198c1f7291954cb6d4bbae183258fa2 (patch) | |
| tree | 01b04c4281d9a75f842a1f4c35e1f5a137fc8b9f /vm/Thread.h | |
| parent | 1bc1fda95df33548197d35a195b594483a53f671 (diff) | |
| parent | 060ed88949321e193e95976c41e647cb46b9778b (diff) | |
| download | android_dalvik-83674b720198c1f7291954cb6d4bbae183258fa2.tar.gz android_dalvik-83674b720198c1f7291954cb6d4bbae183258fa2.tar.bz2 android_dalvik-83674b720198c1f7291954cb6d4bbae183258fa2.zip | |
am 060ed889: am 20677ed1: dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
Merge commit '060ed88949321e193e95976c41e647cb46b9778b'
* commit '060ed88949321e193e95976c41e647cb46b9778b':
dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
Diffstat (limited to 'vm/Thread.h')
| -rw-r--r-- | vm/Thread.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vm/Thread.h b/vm/Thread.h index 020c4b0dc..1b01e08c2 100644 --- a/vm/Thread.h +++ b/vm/Thread.h @@ -22,6 +22,8 @@ #include "jni.h" +#include <utils/threads.h> /* Need SchedPolicy */ + #if defined(CHECK_MUTEX) && !defined(__USE_UNIX98) /* glibc lacks this unless you #define __USE_UNIX98 */ int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type); @@ -421,11 +423,6 @@ bool dvmIsOnThreadList(const Thread* thread); INLINE JNIEnv* dvmGetThreadJNIEnv(Thread* self) { return self->jniEnv; } INLINE void dvmSetThreadJNIEnv(Thread* self, JNIEnv* env) { self->jniEnv = env;} -typedef enum SchedPolicy { - SCHED_BACKGROUND = 0, - SCHED_FOREGROUND = 1, -} SchedPolicy; - /* * Change the scheduling policy of the current process. * This is mapped onto whatever underlying scheme the kernel |