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

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

Merge "use the device's default binder/passthrough mode in vts tests"

parents e54c08ac b21bdc8b

audio/effect/2.0/vts/functional/audio_effect_hidl_hal_test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ using ::android::sp; 
class AudioEffectHidlTest : public ::testing::Test {

 public:

  virtual void SetUp() override {

    // currently test passthrough mode only

    effectsFactory = IEffectsFactory::getService("audio_effects_factory", true);

    effectsFactory = IEffectsFactory::getService("audio_effects_factory");

    ASSERT_NE(effectsFactory, nullptr);

  }

camera/provider/2.4/vts/functional/camera_hidl_hal_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ private: 


void CameraHidlEnvironment::SetUp() {

    // TODO: test the binderized mode

    mProvider = ICameraProvider::getService(CAMERA_PASSTHROUGH_SERVICE_NAME, true);

    mProvider = ICameraProvider::getService(CAMERA_PASSTHROUGH_SERVICE_NAME);

    // TODO: handle the device doesn't have any camera case

    ALOGI_IF(mProvider, "provider is not nullptr, %p", mProvider.get());

    ASSERT_NE(mProvider, nullptr);

gatekeeper/1.0/vts/functional/gatekeeper_hidl_hal_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ class GatekeeperHidlTest : public ::testing::Test { 
  GatekeeperHidlTest() : uid_(0) {}

  virtual void SetUp() override {

    GatekeeperResponse rsp;

    gatekeeper_ = IGatekeeper::getService("gatekeeper", false);

    gatekeeper_ = IGatekeeper::getService("gatekeeper");

    ASSERT_NE(nullptr, gatekeeper_.get());

    doDeleteAllUsers(rsp);

  }

thermal/1.0/vts/functional/thermal_hidl_hal_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ using ::android::sp; 
class ThermalHidlTest : public ::testing::Test {

 public:

  virtual void SetUp() override {

    thermal_ = IThermal::getService(THERMAL_SERVICE_NAME, false);

    thermal_ = IThermal::getService(THERMAL_SERVICE_NAME);

    ASSERT_NE(thermal_, nullptr);

    baseSize_ = 0;

    names_.clear();

vibrator/1.0/vts/functional/vibrator_hidl_hal_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ using ::android::sp; 
class VibratorHidlTest : public ::testing::Test {

 public:

  virtual void SetUp() override {

    vibrator = IVibrator::getService(false);

    vibrator = IVibrator::getService();

    ASSERT_NE(vibrator, nullptr);

  }