drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3812e68e: Merge "kill HAVE_PTHREADS."

Browse Source 
* commit '3812e68ea788782c54c27f69d08bcc1419066cb2':
  kill HAVE_PTHREADS.
This commit is contained in:
Yabin Cui
2015-01-27 06:54:06 +00:00
committed by Android Git Automerger
parent 86b48b3f80 3812e68ea7
commit f70492898b
3 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmds/bootanimation/bootanimation_main.cpp
View File

@ -16,20 +16,14 @@
#define LOG_TAG "BootAnimation" #define LOG_TAG "BootAnimation"
#include <cutils/properties.h>
#include <binder/IPCThreadState.h> #include <binder/IPCThreadState.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
#include <cutils/properties.h>
#include <sys/resource.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/threads.h> #include <utils/threads.h>
#if defined(HAVE_PTHREADS)
# include <pthread.h>
# include <sys/resource.h>
#endif
#include "BootAnimation.h" #include "BootAnimation.h"
using namespace android; using namespace android;
@ -38,9 +32,7 @@ using namespace android;
int main() int main()
{ {
#if defined(HAVE_PTHREADS)
setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_DISPLAY); setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_DISPLAY);
#endif
char value[PROPERTY_VALUE_MAX]; char value[PROPERTY_VALUE_MAX];
property_get("debug.sf.nobootanimation", value, "0"); property_get("debug.sf.nobootanimation", value, "0");

6
libs/hwui/renderthread/RenderThread.cpp
View File

@ -16,10 +16,8 @@
#include "RenderThread.h" #include "RenderThread.h"
#if defined(HAVE_PTHREADS)
#include <sys/resource.h>
#endif
#include <gui/DisplayEventReceiver.h> #include <gui/DisplayEventReceiver.h>
#include <sys/resource.h>
#include <utils/Log.h> #include <utils/Log.h>
#include "../RenderState.h" #include "../RenderState.h"
@ -245,9 +243,7 @@ void RenderThread::requestVsync() {
} }
bool RenderThread::threadLoop() { bool RenderThread::threadLoop() {
#if defined(HAVE_PTHREADS)
setpriority(PRIO_PROCESS, 0, PRIORITY_DISPLAY); setpriority(PRIO_PROCESS, 0, PRIORITY_DISPLAY);
#endif
initThreadLocals(); initThreadLocals();
int timeoutMillis = -1; int timeoutMillis = -1;

6
libs/hwui/thread/TaskManager.cpp
View File

@ -14,10 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include <sys/sysinfo.h>
#if defined(HAVE_PTHREADS)
#include <sys/resource.h> #include <sys/resource.h>
#endif #include <sys/sysinfo.h>
#include "TaskManager.h" #include "TaskManager.h"
#include "Task.h" #include "Task.h"
@ -83,9 +81,7 @@ bool TaskManager::addTaskBase(const sp<TaskBase>& task, const sp<TaskProcessorBa
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
status_t TaskManager::WorkerThread::readyToRun() { status_t TaskManager::WorkerThread::readyToRun() {
#if defined(HAVE_PTHREADS)
setpriority(PRIO_PROCESS, 0, PRIORITY_FOREGROUND); setpriority(PRIO_PROCESS, 0, PRIORITY_FOREGROUND);
#endif
return NO_ERROR; return NO_ERROR;
} }