From e96afe6e91efd036089a6b6c42a855bdec4308ec Mon Sep 17 00:00:00 2001 From: Daniel Nicoara Date: Fri, 24 Mar 2017 15:15:50 -0400 Subject: [PATCH] VR: Rename HIDL service name from vr_hwcomposer to vr This is part of an effort to simplify service names. Bug: 36564122 Test: Ran on device and verified SurfaceFlinger connects to vr_wm Change-Id: I3e2a2b778f3f0d2066bf5b756263de4b238b2f83 --- services/surfaceflinger/DisplayHardware/ComposerHal.cpp | 2 +- services/vr/hardware_composer/vr_hardware_composer_service.cpp | 2 +- services/vr/vr_window_manager/surface_flinger_view.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp index c6e6dcb6cd..d9bddb5af2 100644 --- a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp +++ b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp @@ -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 } diff --git a/services/vr/hardware_composer/vr_hardware_composer_service.cpp b/services/vr/hardware_composer/vr_hardware_composer_service.cpp index 9591748e44..f9802201da 100644 --- a/services/vr/hardware_composer/vr_hardware_composer_service.cpp +++ b/services/vr/hardware_composer/vr_hardware_composer_service.cpp @@ -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 service = android::dvr::HIDL_FETCH_IComposer(instance); diff --git a/services/vr/vr_window_manager/surface_flinger_view.cpp b/services/vr/vr_window_manager/surface_flinger_view.cpp index 46eb8808da..427ad70318 100644 --- a/services/vr/vr_window_manager/surface_flinger_view.cpp +++ b/services/vr/vr_window_manager/surface_flinger_view.cpp @@ -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"); -- 2.11.0