diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-05-09 22:30:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-09 22:30:30 +0000 |
| commit | b14e42f1211940baa76b15589bfa696611fea87f (patch) | |
| tree | af6f98e6617f1227dcdaacea72d5f0bd82d6a19e /cmds | |
| parent | 203a91a6cae0e3272e9b3becefc862d2c8a72e10 (diff) | |
| parent | efa92b2182ab581873aa8e75d596e2e363bd5e6d (diff) | |
| download | frameworks_base-b14e42f1211940baa76b15589bfa696611fea87f.zip frameworks_base-b14e42f1211940baa76b15589bfa696611fea87f.tar.gz frameworks_base-b14e42f1211940baa76b15589bfa696611fea87f.tar.bz2 | |
Merge "Cleanup some of the thread merging."
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/system_server/library/system_init.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/system_server/library/system_init.cpp b/cmds/system_server/library/system_init.cpp index ca84692..9df2ea2 100644 --- a/cmds/system_server/library/system_init.cpp +++ b/cmds/system_server/library/system_init.cpp @@ -94,12 +94,12 @@ extern "C" status_t system_init() if (methodId == NULL) { return UNKNOWN_ERROR; } - env->CallStaticVoidMethod(clazz, methodId); - ALOGI("System server: entering thread pool.\n"); + ALOGI("System server: entering thread pool."); ProcessState::self()->startThreadPool(); - IPCThreadState::self()->joinThreadPool(); - ALOGI("System server: exiting thread pool.\n"); + + // This is the main thread of the system server, and will never exit. + env->CallStaticVoidMethod(clazz, methodId); return NO_ERROR; } |