resolved conflicts for merge of de36313b to master (a0d128c8) · Commits · e / os / android_frameworks_base

cmds/bootanimation/bootanimation_main.cpp

+16 −5

Original line number	Diff line number	Diff line
		@@ -16,9 +16,12 @@

		#define LOG_TAG "BootAnimation"

		#include <cutils/properties.h>

		#include <binder/IPCThreadState.h>
		#include <binder/ProcessState.h>
		#include <binder/IServiceManager.h>

		#include <utils/Log.h>
		#include <utils/threads.h>

		@@ -41,6 +44,12 @@ int main(int argc, char** argv)
		setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_DISPLAY);
		#endif

		char value[PROPERTY_VALUE_MAX];
		property_get("debug.sf.nobootanimation", value, "0");
		int noBootAnimation = atoi(value);
		LOGI_IF(noBootAnimation, "boot animation disabled");
		if (!noBootAnimation) {

		sp<ProcessState> proc(ProcessState::self());
		ProcessState::self()->startThreadPool();

		@@ -48,5 +57,7 @@ int main(int argc, char** argv)
		sp<BootAnimation> boot = new BootAnimation();

		IPCThreadState::self()->joinThreadPool();

		}
		return 0;
		}