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

Commit c9f888b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove dvrDisplayManagerClientGetSurfaceBuffers"

parents f25db04c 5c46fc49

libs/vr/libdisplay/display_manager_client.cpp

+3 −8
Original line number Diff line number Diff line
@@ -98,14 +98,9 @@ bool dvrDisplayManagerClientSurfaceListGetClientIsVisible( 
int dvrDisplayManagerClientGetSurfaceBuffers(

    DvrDisplayManagerClient* client, int surface_id,

    DvrDisplayManagerClientSurfaceBuffers** surface_buffers) {

  std::vector<std::unique_ptr<android::dvr::BufferConsumer>> buffer_list;

  int ret = client->client->GetSurfaceBuffers(surface_id, &buffer_list);

  if (ret < 0)

    return ret;



  *surface_buffers =

      new DvrDisplayManagerClientSurfaceBuffers(std::move(buffer_list));

  return ret;

  // TODO(jwcai, hendrikw) Remove this after we replacing

  // dvrDisplayManagerClientGetSurfaceBuffers is dvr_api.

  return -1;

}



void dvrDisplayManagerClientSurfaceBuffersDestroy(

libs/vr/libdisplay/display_manager_client_impl.cpp

+0 −22
Original line number Diff line number Diff line
@@ -31,27 +31,5 @@ int DisplayManagerClient::GetSurfaceList( 
  return 0;

}



int DisplayManagerClient::GetSurfaceBuffers(

    int surface_id, std::vector<std::unique_ptr<BufferConsumer>>* consumers) {

  auto status =

      InvokeRemoteMethod<DisplayManagerRPC::GetSurfaceBuffers>(surface_id);

  if (!status) {

    ALOGE(

        "DisplayManagerClient::GetSurfaceBuffers: Failed to get buffers for "

        "surface_id=%d: %s",

        surface_id, status.GetErrorMessage().c_str());

    return -status.error();

  }



  std::vector<std::unique_ptr<BufferConsumer>> consumer_buffers;

  std::vector<LocalChannelHandle> channel_handles = status.take();

  for (auto&& handle : channel_handles) {

    consumer_buffers.push_back(BufferConsumer::Import(std::move(handle)));

  }



  *consumers = std::move(consumer_buffers);

  return 0;

}



}  // namespace dvr

}  // namespace android

libs/vr/libdisplay/include/private/dvr/display_manager_client.h

+2 −4
Original line number Diff line number Diff line
@@ -62,10 +62,8 @@ int dvrDisplayManagerClientSurfaceListGetClientZOrder( 
bool dvrDisplayManagerClientSurfaceListGetClientIsVisible(

    DvrDisplayManagerClientSurfaceList* surface_list, size_t index);



// Populates |surface_buffers| with the list of buffers for |surface_id|.

// |surface_id| should be a valid ID from the list of surfaces.

//

// @return Returns 0 on success. Otherwise it returns a negative error value.

// TODO(jwcai, hendrikw) Remove this after we replacing

// dvrDisplayManagerClientGetSurfaceBuffers is dvr_api.

int dvrDisplayManagerClientGetSurfaceBuffers(

    DvrDisplayManagerClient* client, int surface_id,

    DvrDisplayManagerClientSurfaceBuffers** surface_buffers);

libs/vr/libdisplay/include/private/dvr/display_manager_client_impl.h

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ class DisplayManagerClient : public pdx::ClientBase<DisplayManagerClient> { 


  int GetSurfaceList(std::vector<DisplaySurfaceInfo>* surface_list);



  int GetSurfaceBuffers(

      int surface_id, std::vector<std::unique_ptr<BufferConsumer>>* consumers);



  using Client::event_fd;

  using Client::GetChannel;

libs/vr/libdisplay/include/private/dvr/display_rpc.h

+0 −3
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ struct DisplayManagerRPC { 
  // Op codes.

  enum {

    kOpGetSurfaceList = 0,

    kOpGetSurfaceBuffers,

    kOpUpdateSurfaces,

  };
@@ -269,8 +268,6 @@ struct DisplayManagerRPC { 
  // Methods.

  PDX_REMOTE_METHOD(GetSurfaceList, kOpGetSurfaceList,

                    std::vector<DisplaySurfaceInfo>(Void));

  PDX_REMOTE_METHOD(GetSurfaceBuffers, kOpGetSurfaceBuffers,

                    std::vector<LocalChannelHandle>(int surface_id));

  PDX_REMOTE_METHOD(

      UpdateSurfaces, kOpUpdateSurfaces,

      int(const std::map<int, DisplaySurfaceAttributes>& updates));