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

Commit fe4dfb4f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "VR: Rename HIDL service name from vr_hwcomposer to vr"

parents e27f94e2 e96afe6e

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ Composer::Composer(bool useVrComposer) 
      mIsUsingVrComposer(useVrComposer)

{

    if (mIsUsingVrComposer) {

        mComposer = IComposer::getService("vr_hwcomposer");

        mComposer = IComposer::getService("vr");

    } else {

        mComposer = IComposer::getService(); // use default name

    }

services/vr/hardware_composer/vr_hardware_composer_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int main() { 


  // Register the hwbinder HWC HAL service used by SurfaceFlinger while in VR

  // mode.

  const char instance[] = "vr_hwcomposer";

  const char instance[] = "vr";

  android::sp<IComposer> service =

      android::dvr::HIDL_FETCH_IComposer(instance);

services/vr/vr_window_manager/surface_flinger_view.cpp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ SurfaceFlingerView::SurfaceFlingerView() {} 
SurfaceFlingerView::~SurfaceFlingerView() {}



bool SurfaceFlingerView::Initialize(HwcCallback::Client *client) {

  const char vr_hwcomposer_name[] = "vr_hwcomposer";

  const char vr_hwcomposer_name[] = "vr";

  vr_hwcomposer_ = HIDL_FETCH_IComposer(vr_hwcomposer_name);

  if (!vr_hwcomposer_.get()) {

    ALOGE("Failed to get vr_hwcomposer");