diff options
| -rw-r--r-- | libs/vr/libbufferhub/buffer_hub-test.cpp | 3 | ||||
| -rw-r--r-- | libs/vr/libbufferhub/include/private/dvr/buffer_hub_client.h | 10 | ||||
| -rw-r--r-- | libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h | 3 | ||||
| -rw-r--r-- | libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp | 3 | ||||
| -rw-r--r-- | libs/vr/libdisplay/display_manager_client.cpp | 1 | ||||
| -rw-r--r-- | libs/vr/libdisplay/include/private/dvr/display_client.h | 1 | ||||
| -rw-r--r-- | libs/vr/libdvr/dvr_buffer.cpp | 3 | ||||
| -rw-r--r-- | libs/vr/libdvr/dvr_display_manager.cpp | 2 | ||||
| -rw-r--r-- | libs/vr/libvrflinger/acquired_buffer.h | 4 | ||||
| -rw-r--r-- | libs/vr/libvrflinger/display_service.h | 1 | ||||
| -rw-r--r-- | libs/vr/libvrflinger/hardware_composer.h | 1 | ||||
| -rw-r--r-- | libs/vr/libvrsensor/pose_client.cpp | 2 |
12 files changed, 12 insertions, 22 deletions
diff --git a/libs/vr/libbufferhub/buffer_hub-test.cpp b/libs/vr/libbufferhub/buffer_hub-test.cpp index 6cb6541c52..1359f4c137 100644 --- a/libs/vr/libbufferhub/buffer_hub-test.cpp +++ b/libs/vr/libbufferhub/buffer_hub-test.cpp @@ -1,7 +1,8 @@ #include <gtest/gtest.h> #include <poll.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/bufferhub_rpc.h> +#include <private/dvr/consumer_buffer.h> +#include <private/dvr/producer_buffer.h> #include <sys/epoll.h> #include <sys/eventfd.h> #include <ui/BufferHubBuffer.h> diff --git a/libs/vr/libbufferhub/include/private/dvr/buffer_hub_client.h b/libs/vr/libbufferhub/include/private/dvr/buffer_hub_client.h deleted file mode 100644 index 1daeed9b50..0000000000 --- a/libs/vr/libbufferhub/include/private/dvr/buffer_hub_client.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef ANDROID_DVR_BUFFER_HUB_CLIENT_H_ -#define ANDROID_DVR_BUFFER_HUB_CLIENT_H_ - -// TODO(b/116855254): This header is completely deprecated and replaced by -// consumer_buffer.h and producer_buffer.h. Remove this file once all references -// to it has been removed. -#include <private/dvr/consumer_buffer.h> -#include <private/dvr/producer_buffer.h> - -#endif // ANDROID_DVR_BUFFER_HUB_CLIENT_H_ diff --git a/libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h b/libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h index def7c6b66e..53ab2b2e7a 100644 --- a/libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h +++ b/libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h @@ -13,10 +13,11 @@ // in these headers and their dependencies. #include <pdx/client.h> #include <pdx/status.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/buffer_hub_queue_parcelable.h> #include <private/dvr/bufferhub_rpc.h> +#include <private/dvr/consumer_buffer.h> #include <private/dvr/epoll_file_descriptor.h> +#include <private/dvr/producer_buffer.h> #if defined(__clang__) #pragma clang diagnostic pop diff --git a/libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp b/libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp index fd6ca43342..159d6dc4b9 100644 --- a/libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp +++ b/libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp @@ -1,8 +1,9 @@ #include <base/logging.h> #include <binder/Parcel.h> #include <dvr/dvr_api.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/buffer_hub_queue_client.h> +#include <private/dvr/consumer_buffer.h> +#include <private/dvr/producer_buffer.h> #include <gtest/gtest.h> #include <poll.h> diff --git a/libs/vr/libdisplay/display_manager_client.cpp b/libs/vr/libdisplay/display_manager_client.cpp index 974c231375..fdeeb70dfb 100644 --- a/libs/vr/libdisplay/display_manager_client.cpp +++ b/libs/vr/libdisplay/display_manager_client.cpp @@ -1,7 +1,6 @@ #include "include/private/dvr/display_manager_client.h" #include <pdx/default_transport/client_channel_factory.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/buffer_hub_queue_client.h> #include <private/dvr/display_protocol.h> #include <utils/Log.h> diff --git a/libs/vr/libdisplay/include/private/dvr/display_client.h b/libs/vr/libdisplay/include/private/dvr/display_client.h index caf3182e91..f8f5b3ddb3 100644 --- a/libs/vr/libdisplay/include/private/dvr/display_client.h +++ b/libs/vr/libdisplay/include/private/dvr/display_client.h @@ -5,7 +5,6 @@ #include <hardware/hwcomposer.h> #include <pdx/client.h> #include <pdx/file_handle.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/buffer_hub_queue_client.h> #include <private/dvr/display_protocol.h> diff --git a/libs/vr/libdvr/dvr_buffer.cpp b/libs/vr/libdvr/dvr_buffer.cpp index baf1f2f5da..c11706fc7f 100644 --- a/libs/vr/libdvr/dvr_buffer.cpp +++ b/libs/vr/libdvr/dvr_buffer.cpp @@ -2,7 +2,8 @@ #include <android/hardware_buffer.h> #include <dvr/dvr_shared_buffers.h> -#include <private/dvr/buffer_hub_client.h> +#include <private/dvr/consumer_buffer.h> +#include <private/dvr/producer_buffer.h> #include <ui/GraphicBuffer.h> #include "dvr_internal.h" diff --git a/libs/vr/libdvr/dvr_display_manager.cpp b/libs/vr/libdvr/dvr_display_manager.cpp index 852f9a4726..fe91b14679 100644 --- a/libs/vr/libdvr/dvr_display_manager.cpp +++ b/libs/vr/libdvr/dvr_display_manager.cpp @@ -2,8 +2,8 @@ #include <dvr/dvr_buffer.h> #include <pdx/rpc/variant.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/buffer_hub_queue_client.h> +#include <private/dvr/consumer_buffer.h> #include <private/dvr/display_client.h> #include <private/dvr/display_manager_client.h> diff --git a/libs/vr/libvrflinger/acquired_buffer.h b/libs/vr/libvrflinger/acquired_buffer.h index 1a200aabd2..9e35a39bfd 100644 --- a/libs/vr/libvrflinger/acquired_buffer.h +++ b/libs/vr/libvrflinger/acquired_buffer.h @@ -2,7 +2,7 @@ #define ANDROID_DVR_SERVICES_DISPLAYD_ACQUIRED_BUFFER_H_ #include <pdx/file_handle.h> -#include <private/dvr/buffer_hub_client.h> +#include <private/dvr/consumer_buffer.h> #include <memory> @@ -43,7 +43,7 @@ class AcquiredBuffer { // Accessors for the underlying BufferConsumer, the acquire fence, and the // use-case specific sequence value from the acquisition (see - // private/dvr/buffer_hub_client.h). + // private/dvr/consumer_buffer.h). std::shared_ptr<BufferConsumer> buffer() const { return buffer_; } int acquire_fence() const { return acquire_fence_.Get(); } diff --git a/libs/vr/libvrflinger/display_service.h b/libs/vr/libvrflinger/display_service.h index 6fad58ef6f..e0f2eddfea 100644 --- a/libs/vr/libvrflinger/display_service.h +++ b/libs/vr/libvrflinger/display_service.h @@ -4,7 +4,6 @@ #include <dvr/dvr_api.h> #include <pdx/service.h> #include <pdx/status.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/bufferhub_rpc.h> #include <private/dvr/display_protocol.h> diff --git a/libs/vr/libvrflinger/hardware_composer.h b/libs/vr/libvrflinger/hardware_composer.h index 94a23376bc..6c25b3ee12 100644 --- a/libs/vr/libvrflinger/hardware_composer.h +++ b/libs/vr/libvrflinger/hardware_composer.h @@ -22,7 +22,6 @@ #include <dvr/dvr_vsync.h> #include <pdx/file_handle.h> #include <pdx/rpc/variant.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/shared_buffer_helpers.h> #include <private/dvr/vsync_service.h> diff --git a/libs/vr/libvrsensor/pose_client.cpp b/libs/vr/libvrsensor/pose_client.cpp index 710d75a7b1..c72f75e69c 100644 --- a/libs/vr/libvrsensor/pose_client.cpp +++ b/libs/vr/libvrsensor/pose_client.cpp @@ -8,8 +8,8 @@ #include <pdx/client.h> #include <pdx/default_transport/client_channel_factory.h> #include <pdx/file_handle.h> -#include <private/dvr/buffer_hub_client.h> #include <private/dvr/buffer_hub_queue_client.h> +#include <private/dvr/consumer_buffer.h> #include <private/dvr/display_client.h> #include <private/dvr/pose-ipc.h> #include <private/dvr/shared_buffer_helpers.h> |