diff options
author | Mathias Agopian <mathias@google.com> | 2009-07-28 15:42:53 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-07-28 15:42:53 -0700 |
commit | a0d128c8c601750dcbcf97342ffca7865b8a6f9e (patch) | |
tree | ff8bb78f16181c0cac9b057680bba535e0f9df34 /cmds | |
parent | 461bcdd3b7fb2d004bdc6b97b3cf36d137b11ad1 (diff) | |
parent | de36313b0b80c019c2784edd9d41f6761fe80685 (diff) | |
download | frameworks_base-a0d128c8c601750dcbcf97342ffca7865b8a6f9e.zip frameworks_base-a0d128c8c601750dcbcf97342ffca7865b8a6f9e.tar.gz frameworks_base-a0d128c8c601750dcbcf97342ffca7865b8a6f9e.tar.bz2 |
resolved conflicts for merge of de36313b to master
Diffstat (limited to 'cmds')
-rw-r--r-- | cmds/bootanimation/bootanimation_main.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/cmds/bootanimation/bootanimation_main.cpp b/cmds/bootanimation/bootanimation_main.cpp index 346f156..3c82fe5 100644 --- a/cmds/bootanimation/bootanimation_main.cpp +++ b/cmds/bootanimation/bootanimation_main.cpp @@ -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,12 +44,20 @@ int main(int argc, char** argv) setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_DISPLAY); #endif - sp<ProcessState> proc(ProcessState::self()); - ProcessState::self()->startThreadPool(); + 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(); + + // create the boot animation object + sp<BootAnimation> boot = new BootAnimation(); - // create the boot animation object - sp<BootAnimation> boot = new BootAnimation(); + IPCThreadState::self()->joinThreadPool(); - IPCThreadState::self()->joinThreadPool(); + } return 0; } |