Merge "Merged vr window manager and vr composer"

diff --cc services/vr/vr_window_manager/Android.mk
Simple merge

diff --cc services/vr/vr_window_manager/application.cpp
Simple merge

diff --cc services/vr/vr_window_manager/hwc_callback.cpp
Simple merge

diff --cc services/vr/vr_window_manager/vr_window_manager.cpp
index f478f45,c445487..5e9215c
--- 1/services/vr/vr_window_manager/vr_window_manager.cpp
--- 2/services/vr/vr_window_manager/vr_window_manager.cpp
+++ b/services/vr/vr_window_manager/vr_window_manager.cpp
@@@ -5,29 -8,53 +8,53 @@@
  #include "shell_view.h"
  #include "vr_window_manager_binder.h"
  
+ using namespace android;
+ using namespace android::dvr;
+ 
  int main(int /* argc */, char** /* argv */) {
+   android::ProcessState::self()->startThreadPool();
+ 
+   // Create vr_hwcomposer.
+   const char vr_hwcomposer_name[] = "vr_hwcomposer";
+   sp<IComposer> vr_hwcomposer = HIDL_FETCH_IComposer(vr_hwcomposer_name);
+   LOG_ALWAYS_FATAL_IF(!vr_hwcomposer.get(), "Failed to get vr_hwcomposer");
+   LOG_ALWAYS_FATAL_IF(vr_hwcomposer->isRemote(),
+                       "vr_hwcomposer service is remote");
+ 
+   const android::status_t vr_hwcomposer_status =
+       vr_hwcomposer->registerAsService(vr_hwcomposer_name);
+   LOG_ALWAYS_FATAL_IF(vr_hwcomposer_status != ::android::OK,
+                       "Failed to register vr_hwcomposer service");
+ 
+   // ShellView needs to be created after vr_hwcomposer.
    android::dvr::ShellView app;
 -  const int app_status = app.Initialize(nullptr, nullptr, nullptr);
 +  const int app_status = app.Initialize();
    LOG_ALWAYS_FATAL_IF(app_status != 0, "failed to initialize: %d", app_status);
  
-   android::service::vr::VrWindowManagerBinder service(app);
-   const int status = service.Initialize();
+   // Create vr_wm_binder.
+   android::service::vr::VrWindowManagerBinder vr_wm_binder(app);
+   const int status = vr_wm_binder.Initialize();
    LOG_ALWAYS_FATAL_IF(status != 0, "initialization failed: %d", status);
  
-   android::ProcessState::self()->startThreadPool();
- 
    android::sp<android::IServiceManager> sm(android::defaultServiceManager());
-   const android::status_t service_status = sm->addService(
-       android::service::vr::VrWindowManagerBinder::SERVICE_NAME(), &service,
-       false /*allowIsolated*/);
-   LOG_ALWAYS_FATAL_IF(service_status != android::OK, "service not added: %d",
-                       static_cast<int>(service_status));
+   const android::status_t vr_wm_binder_status =
+       sm->addService(
+           android::service::vr::VrWindowManagerBinder::SERVICE_NAME(),
+           &vr_wm_binder, false /*allowIsolated*/);
+   LOG_ALWAYS_FATAL_IF(vr_wm_binder_status != android::OK,
+                       "vr_wm_binder service not added: %d",
+                       static_cast<int>(vr_wm_binder_status));
  
-   app.SetControllerDataProvider(&service);
+   app.SetControllerDataProvider(&vr_wm_binder);
  
-   while (true)
+   android::hardware::ProcessState::self()->startThreadPool();
+ 
+   while (true) {
      app.DrawFrame();
+   }
  
+   android::hardware::IPCThreadState::self()->joinThreadPool();
    android::IPCThreadState::self()->joinThreadPool();
+ 
    return 0;
  }