| commit | e96afe6e91efd036089a6b6c42a855bdec4308ec | [log] [tgz] |
|---|---|---|
| author | Daniel Nicoara <dnicoara@google.com> | Fri Mar 24 15:15:50 2017 -0400 |
| committer | Daniel Nicoara <dnicoara@google.com> | Fri Mar 24 15:19:55 2017 -0400 |
| tree | 0789390a35005b0bca810a48b07fca9b06253cfb | |
| parent | e153b292d8c0f445fc16fa4a4ca6b0b88defad9f [diff] |
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
diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp index c6e6dcb..d9bddb5 100644 --- a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp +++ b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
@@ -129,7 +129,7 @@ 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 9591748..f980220 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 @@ // 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);
diff --git a/services/vr/vr_window_manager/surface_flinger_view.cpp b/services/vr/vr_window_manager/surface_flinger_view.cpp index 46eb880..427ad70 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() {} 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");