Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8ab2f18 authored by Kevin Schoedel's avatar Kevin Schoedel Committed by android-build-merger
Browse files

Merge "Don't stack-allocate binder objects." into oc-dev 

am: 792530dc

Change-Id: Icbed5136762f01f268ac5f33faefc9097a973eed
parents 885e45c2 792530dc

services/vr/virtual_touchpad/main.cpp

+5 −4
Original line number Diff line number Diff line
@@ -8,8 +8,9 @@ 


int main() {

  ALOGI("Starting");

  android::dvr::VirtualTouchpadService touchpad_service(

      std::move(android::dvr::VirtualTouchpadEvdev::Create()));

  android::sp<android::dvr::VirtualTouchpadService> touchpad_service =

      new android::dvr::VirtualTouchpadService(

          android::dvr::VirtualTouchpadEvdev::Create());



  signal(SIGPIPE, SIG_IGN);

  android::sp<android::ProcessState> ps(android::ProcessState::self());
@@ -19,8 +20,8 @@ int main() { 


  android::sp<android::IServiceManager> sm(android::defaultServiceManager());

  const android::status_t service_status =

      sm->addService(android::String16(touchpad_service.SERVICE_NAME()),

                     &touchpad_service, false /*allowIsolated*/);

      sm->addService(android::String16(touchpad_service->SERVICE_NAME()),

                     touchpad_service, false /*allowIsolated*/);

  if (service_status != android::OK) {

    ALOGE("virtual touchpad service not added: %d",

          static_cast<int>(service_status));

services/vr/vr_window_manager/vr_window_manager.cpp

+7 −7
Original line number Diff line number Diff line
@@ -20,20 +20,20 @@ int main(int /* argc */, char** /* argv */) { 
  LOG_ALWAYS_FATAL_IF(app_status != 0, "failed to initialize: %d", app_status);



  // Create vr_wm_binder.

  android::service::vr::VrWindowManagerBinder vr_wm_binder(app);

  const int status = vr_wm_binder.Initialize();

  android::sp<android::service::vr::VrWindowManagerBinder> vr_wm_binder =

      new android::service::vr::VrWindowManagerBinder(app);

  const int status = vr_wm_binder->Initialize();

  LOG_ALWAYS_FATAL_IF(status != 0, "initialization failed: %d", status);



  android::sp<android::IServiceManager> sm(android::defaultServiceManager());

  const android::status_t vr_wm_binder_status =

      sm->addService(

  const android::status_t vr_wm_binder_status = sm->addService(

      android::service::vr::VrWindowManagerBinder::SERVICE_NAME(),

          &vr_wm_binder, false /*allowIsolated*/);

      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(&vr_wm_binder);

  app.SetControllerDataProvider(vr_wm_binder.get());



  android::hardware::ProcessState::self()->startThreadPool();