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

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

Merge "thermal HAL uses "default" service name"

parents 92b7f839 5d1dc850

thermal/1.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ using android::hardware::thermal::V1_0::IThermal; 
using android::hardware::defaultPassthroughServiceImplementation;



int main() {

    return defaultPassthroughServiceImplementation<IThermal>("thermal");

    return defaultPassthroughServiceImplementation<IThermal>();

}

thermal/1.0/vts/functional/thermal_hidl_hal_test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ using ::android::hardware::Return; 
using ::android::hardware::Void;

using ::android::sp;



#define THERMAL_SERVICE_NAME "thermal"

#define MONITORING_OPERATION_NUMBER 10



#define MAX_DEVICE_TEMPERATURE 200
@@ -50,7 +49,7 @@ using ::android::sp; 
class ThermalHidlTest : public ::testing::Test {

 public:

  virtual void SetUp() override {

    thermal_ = IThermal::getService(THERMAL_SERVICE_NAME);

    thermal_ = IThermal::getService();

    ASSERT_NE(thermal_, nullptr);

    baseSize_ = 0;

    names_.clear();