Remove unnecessary clients and rename files.
- Remove clients for obsolete services.
- Rename display protocol defs file to match purpose.
- Rename display manager client file. "impl" does not match naming
conventions used by DVR libraries.
- Remove video mesh surface interface. This will be replaced by more
general surface support in the unified O compositor.
Bug: 36401174
Test: Build; run cube sea.
Change-Id: Idb782623319329f6fa1b0aa45005d9fee3b9957d
diff --git a/libs/vr/libvrflinger/display_manager_service.cpp b/libs/vr/libvrflinger/display_manager_service.cpp
index 42ffaec..61bb71c 100644
--- a/libs/vr/libvrflinger/display_manager_service.cpp
+++ b/libs/vr/libvrflinger/display_manager_service.cpp
@@ -3,7 +3,7 @@
#include <pdx/channel_handle.h>
#include <pdx/default_transport/service_endpoint.h>
#include <private/android_filesystem_config.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
#include <private/dvr/trusted_uids.h>
#include <sys/poll.h>
diff --git a/libs/vr/libvrflinger/display_manager_service.h b/libs/vr/libvrflinger/display_manager_service.h
index b2417e5..f59520c 100644
--- a/libs/vr/libvrflinger/display_manager_service.h
+++ b/libs/vr/libvrflinger/display_manager_service.h
@@ -2,7 +2,7 @@
#define ANDROID_DVR_SERVICES_DISPLAYD_DISPLAY_MANAGER_SERVICE_H_
#include <pdx/service.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
#include "display_service.h"
diff --git a/libs/vr/libvrflinger/display_service.cpp b/libs/vr/libvrflinger/display_service.cpp
index 2dc840e..f56bc02 100644
--- a/libs/vr/libvrflinger/display_service.cpp
+++ b/libs/vr/libvrflinger/display_service.cpp
@@ -7,7 +7,7 @@
#include <pdx/rpc/remote_method.h>
#include <private/dvr/composite_hmd.h>
#include <private/dvr/device_metrics.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
#include <private/dvr/display_types.h>
#include <private/dvr/numeric.h>
#include <private/dvr/polynomial_radial_distortion.h>
diff --git a/libs/vr/libvrflinger/display_service.h b/libs/vr/libvrflinger/display_service.h
index dd5cac9..3b0d07e 100644
--- a/libs/vr/libvrflinger/display_service.h
+++ b/libs/vr/libvrflinger/display_service.h
@@ -4,7 +4,7 @@
#include <pdx/service.h>
#include <private/dvr/buffer_hub_client.h>
#include <private/dvr/bufferhub_rpc.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
#include <private/dvr/late_latch.h>
#include <functional>
diff --git a/libs/vr/libvrflinger/display_surface.h b/libs/vr/libvrflinger/display_surface.h
index 2e4cf75..1fec344 100644
--- a/libs/vr/libvrflinger/display_surface.h
+++ b/libs/vr/libvrflinger/display_surface.h
@@ -3,7 +3,7 @@
#include <pdx/file_handle.h>
#include <pdx/service.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
#include <private/dvr/ring_buffer.h>
#include <functional>
diff --git a/libs/vr/libvrflinger/surface_channel.h b/libs/vr/libvrflinger/surface_channel.h
index bb6b1c5..9dcac3f 100644
--- a/libs/vr/libvrflinger/surface_channel.h
+++ b/libs/vr/libvrflinger/surface_channel.h
@@ -3,7 +3,7 @@
#include <pdx/service.h>
#include <private/dvr/buffer_hub_client.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
namespace android {
namespace dvr {
diff --git a/libs/vr/libvrflinger/video_compositor.cpp b/libs/vr/libvrflinger/video_compositor.cpp
index c5a5b64..e42caaa 100644
--- a/libs/vr/libvrflinger/video_compositor.cpp
+++ b/libs/vr/libvrflinger/video_compositor.cpp
@@ -4,7 +4,7 @@
#include <GLES2/gl2ext.h>
#include <private/dvr/debug.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
namespace android {
namespace dvr {
diff --git a/libs/vr/libvrflinger/video_mesh_surface.cpp b/libs/vr/libvrflinger/video_mesh_surface.cpp
index ce0dfca..76dd94f 100644
--- a/libs/vr/libvrflinger/video_mesh_surface.cpp
+++ b/libs/vr/libvrflinger/video_mesh_surface.cpp
@@ -1,7 +1,7 @@
#include "video_mesh_surface.h"
#include <private/dvr/buffer_hub_queue_core.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
using android::pdx::LocalChannelHandle;
using android::pdx::rpc::DispatchRemoteMethod;
diff --git a/libs/vr/libvrflinger/vsync_service.cpp b/libs/vr/libvrflinger/vsync_service.cpp
index 612b9b2..cda815c 100644
--- a/libs/vr/libvrflinger/vsync_service.cpp
+++ b/libs/vr/libvrflinger/vsync_service.cpp
@@ -9,7 +9,7 @@
#include <pdx/default_transport/service_endpoint.h>
#include <private/dvr/clock_ns.h>
-#include <private/dvr/display_rpc.h>
+#include <private/dvr/display_protocol.h>
#include <private/dvr/display_types.h>
using android::pdx::Channel;