diff options
| author | Dave Sparks <davidsparks@android.com> | 2009-11-23 19:58:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-23 19:58:33 -0800 |
| commit | 1e914ac7fce9523b5a932389798589eba91ca4dd (patch) | |
| tree | 01b23226ab763d913b550b0c53eb731e2a073224 /media/libmedia | |
| parent | ebcb7c3167e76c19d4721dbc472772744918e868 (diff) | |
| parent | 16cc72bdef471ffeee3f61eba8262783de248b04 (diff) | |
| download | frameworks_base-1e914ac7fce9523b5a932389798589eba91ca4dd.zip frameworks_base-1e914ac7fce9523b5a932389798589eba91ca4dd.tar.gz frameworks_base-1e914ac7fce9523b5a932389798589eba91ca4dd.tar.bz2 | |
am 16cc72bd: Fix simulator build.
Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2
* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
Fix simulator build.
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/IMediaMetadataRetriever.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/media/libmedia/IMediaMetadataRetriever.cpp b/media/libmedia/IMediaMetadataRetriever.cpp index 68dd880..e529d25 100644 --- a/media/libmedia/IMediaMetadataRetriever.cpp +++ b/media/libmedia/IMediaMetadataRetriever.cpp @@ -41,6 +41,15 @@ pid_t gettid() { return syscall(__NR_gettid);} #undef __KERNEL__ #endif +static int myTid() { +#ifdef HAVE_GETTID + return gettid(); +#else + return getpid(); +#endif +} + +#undef LOG_TAG #define LOG_TAG "IMediaMetadataRetriever" #include <utils/Log.h> #include <cutils/sched_policy.h> @@ -50,18 +59,18 @@ namespace android { static void sendSchedPolicy(Parcel& data) { SchedPolicy policy; - get_sched_policy(gettid(), &policy); + get_sched_policy(myTid(), &policy); data.writeInt32(policy); } static void setSchedPolicy(const Parcel& data) { SchedPolicy policy = (SchedPolicy) data.readInt32(); - set_sched_policy(gettid(), policy); + set_sched_policy(myTid(), policy); } static void restoreSchedPolicy() { - set_sched_policy(gettid(), SP_FOREGROUND); + set_sched_policy(myTid(), SP_FOREGROUND); } }; // end namespace android #endif |