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

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

Merge "Remove getServiceProxy() on BufferHubBinderService"

parents 95f01f42 8d9d33ee

services/vr/bufferhubd/buffer_hub_binder.cpp

+0 −19
Original line number Diff line number Diff line
@@ -65,25 +65,6 @@ status_t BufferHubBinderService::dump(int fd, const Vector<String16>& args) { 
  return NO_ERROR;

}



sp<IBufferHub> BufferHubBinderService::getServiceProxy() {

  sp<IServiceManager> sm = defaultServiceManager();

  sp<IBinder> service = sm->checkService(String16(getServiceName()));



  if (service == nullptr) {

    ALOGE("getServiceProxy(): %s binder service not found!", getServiceName());

    return nullptr;

  }



  sp<IBufferHub> ret = interface_cast<IBufferHub>(service);

  if (ret == nullptr) {

    ALOGE("getServiceProxy(): %s binder service type casting error!",

          getServiceName());

    return nullptr;

  }



  return ret;

}



sp<IBufferClient> BufferHubBinderService::createBuffer(

    uint32_t width, uint32_t height, uint32_t layer_count, uint32_t format,

    uint64_t usage, uint64_t user_metadata_size) {

services/vr/bufferhubd/include/private/dvr/IBufferHub.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ class IBufferHub : public IInterface { 
 public:

  DECLARE_META_INTERFACE(BufferHub);



  static const char* getServiceName() { return "bufferhubd"; }

  virtual sp<IBufferClient> createBuffer(uint32_t width, uint32_t height,

                                         uint32_t layer_count, uint32_t format,

                                         uint64_t usage,

services/vr/bufferhubd/include/private/dvr/buffer_hub_binder.h

+0 −4
Original line number Diff line number Diff line
@@ -15,14 +15,10 @@ class BufferHubBinderService : public BinderService<BufferHubBinderService>, 
                               public BnBufferHub {

 public:

  static status_t start(const std::shared_ptr<BufferHubService>& pdx_service);

  static const char* getServiceName() { return "bufferhubd"; }

  // Dump bufferhub related information to given fd (usually stdout)

  // usage: adb shell dumpsys bufferhubd

  virtual status_t dump(int fd, const Vector<String16>& args) override;



  // Helper function to get the BpReference to this service

  static sp<IBufferHub> getServiceProxy();



  // Binder IPC functions

  sp<IBufferClient> createBuffer(uint32_t width, uint32_t height,

                                 uint32_t layer_count, uint32_t format,

services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp

+6 −4
Original line number Diff line number Diff line 
#include <binder/IServiceManager.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <private/dvr/IBufferClient.h>

#include <private/dvr/buffer_hub_binder.h>

#include <private/dvr/IBufferHub.h>

#include <ui/PixelFormat.h>



namespace android {
@@ -9,7 +10,6 @@ namespace dvr { 


namespace {



using testing::Ne;

using testing::NotNull;



const int kWidth = 640;
@@ -22,8 +22,10 @@ const size_t kUserMetadataSize = 0; 
class BufferHubBinderServiceTest : public ::testing::Test {

 protected:

  void SetUp() override {

    service = BufferHubBinderService::getServiceProxy();

    ASSERT_THAT(service, Ne(nullptr));

    status_t ret = getService<IBufferHub>(

        String16(IBufferHub::getServiceName()), &service);

    ASSERT_EQ(ret, OK);

    ASSERT_THAT(service, NotNull());

  }



  sp<IBufferHub> service;