Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9a57121 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 9fbb534e: Merge change Iafbeb31b into eclair-mr2

Merge commit '9fbb534ebddb2ae43e862a3bc0ff5859358b194b' into eclair-mr2-plus-aosp

* commit '9fbb534ebddb2ae43e862a3bc0ff5859358b194b':
  Maybe really fix windows build.
parents 8bee0b7b ccaf45c5
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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 {