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

Commit b67331d6 authored by Tianyu Jiang's avatar Tianyu Jiang Committed by Android (Google) Code Review
Browse files

Merge "Remove the deprecated buffer_hub_client.h"

parents 994bf32a 49642327
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
#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>
+0 −10
Original line number Diff line number Diff line
#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_
+2 −1
Original line number Diff line number Diff line
@@ -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
+2 −1
Original line number Diff line number Diff line
#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>
+0 −1
Original line number Diff line number Diff line
#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>
Loading