summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-12-09 15:58:01 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-09 15:58:01 -0800
commitea483723b3cc630cf5b5b6fda7b08d9592bdbbde (patch)
treeebe00f773b59f5cfd28b64aec0f468d641140dd2
parent0f62abd986e1900ab4260e559b2dc7d917b6470f (diff)
parent9fbb534ebddb2ae43e862a3bc0ff5859358b194b (diff)
downloadframeworks_base-ea483723b3cc630cf5b5b6fda7b08d9592bdbbde.zip
frameworks_base-ea483723b3cc630cf5b5b6fda7b08d9592bdbbde.tar.gz
frameworks_base-ea483723b3cc630cf5b5b6fda7b08d9592bdbbde.tar.bz2
am 9fbb534e: Merge change Iafbeb31b into eclair-mr2
Merge commit '9fbb534ebddb2ae43e862a3bc0ff5859358b194b' into eclair-mr2-plus-aosp * commit '9fbb534ebddb2ae43e862a3bc0ff5859358b194b': Maybe really fix windows build.
-rw-r--r--libs/utils/Threads.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/utils/Threads.cpp b/libs/utils/Threads.cpp
index 00f9943..2b1f490 100644
--- a/libs/utils/Threads.cpp
+++ b/libs/utils/Threads.cpp
@@ -286,10 +286,12 @@ int androidSetThreadSchedulingGroup(pid_t tid, int grp)
return BAD_VALUE;
}
+#if defined(HAVE_PTHREADS)
if (set_sched_policy(tid, (grp == ANDROID_TGROUP_BG_NONINTERACT) ?
SP_BACKGROUND : SP_FOREGROUND)) {
return PERMISSION_DENIED;
}
+#endif
return NO_ERROR;
}
@@ -297,6 +299,8 @@ int androidSetThreadSchedulingGroup(pid_t tid, int grp)
int androidSetThreadPriority(pid_t tid, int pri)
{
int rc = 0;
+
+#if defined(HAVE_PTHREADS)
int lasterr = 0;
if (pri >= ANDROID_PRIORITY_BACKGROUND) {
@@ -309,7 +313,6 @@ int androidSetThreadPriority(pid_t tid, int pri)
lasterr = errno;
}
-#if defined(HAVE_PTHREADS)
if (setpriority(PRIO_PROCESS, tid, pri) < 0) {
rc = INVALID_OPERATION;
} else {