SurfaceFlinger now runs in the process's main thread
it used to spawn its own thread and return the main thread
to the binder thread pool -- this was confusing the naming
of things in the kernel.
Bug: 10331839
Change-Id: I2d13a6d73409a38109300fcbe6a04b4c41cb5d00
diff --git a/services/surfaceflinger/main_surfaceflinger.cpp b/services/surfaceflinger/main_surfaceflinger.cpp
index 8503d4e..a609b6f 100644
--- a/services/surfaceflinger/main_surfaceflinger.cpp
+++ b/services/surfaceflinger/main_surfaceflinger.cpp
@@ -14,7 +14,10 @@
* limitations under the License.
*/
-#include <binder/BinderService.h>
+#include <binder/IServiceManager.h>
+#include <binder/IPCThreadState.h>
+#include <binder/ProcessState.h>
+#include <binder/IServiceManager.h>
#include "SurfaceFlinger.h"
using namespace android;
@@ -23,6 +26,23 @@
// When SF is launched in its own process, limit the number of
// binder threads to 4.
ProcessState::self()->setThreadPoolMaxThreadCount(4);
- SurfaceFlinger::publishAndJoinThreadPool(true);
+
+ // instantiate surfaceflinger
+ sp<SurfaceFlinger> flinger = new SurfaceFlinger();
+
+ // initialize before clients can connect
+ flinger->init();
+
+ // start the thread pool
+ sp<ProcessState> ps(ProcessState::self());
+ ps->startThreadPool();
+
+ // publish surface flinger
+ sp<IServiceManager> sm(defaultServiceManager());
+ sm->addService(String16(SurfaceFlinger::getServiceName()), flinger, false);
+
+ // run in this thread
+ flinger->run();
+
return 0;
}