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

Commit 81219cad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't expect HIDL bufferpool service when HIDL is not supported" into main am: e61ee3b6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3017696



Change-Id: Id2f0f912af1b74647515673306cd4f0d21b9da2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea926d5a e61ee3b6

media/module/bufferpool/1.0/vts/multi.cpp

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <hidl/HidlSupport.h>

#include <hidl/HidlTransportSupport.h>

#include <hidl/LegacySupport.h>

#include <hidl/ServiceManagement.h>

#include <hidl/Status.h>

#include <signal.h>

#include <sys/types.h>
@@ -36,6 +37,7 @@ 


using android::hardware::configureRpcThreadpool;

using android::hardware::hidl_handle;

using android::hardware::isHidlSupported;

using android::hardware::media::bufferpool::V1_0::IClientManager;

using android::hardware::media::bufferpool::V1_0::ResultStatus;

using android::hardware::media::bufferpool::V1_0::implementation::BufferId;
@@ -178,6 +180,7 @@ TEST_F(BufferpoolMultiTest, TransferBuffer) { 
  ResultStatus status;

  PipeMessage message;



  if (!isHidlSupported()) GTEST_SKIP() << "HIDL is not supported on this device";

  ASSERT_TRUE(receiveMessage(mResultPipeFds, &message));



  android::sp<IClientManager> receiver = IClientManager::getService();