Merge "power HAL uses "default" service name" (b338d550) · Commits · e / os / android_hardware_interfaces

power/1.0/default/Power.cpp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -144,24 +144,24 @@ done:
	return Void();		return Void();
	}		}

	IPower* HIDL_FETCH_IPower(const char* name) {		IPower* HIDL_FETCH_IPower(const char* /* name */) {
	int ret = 0;		int ret = 0;
	const hw_module_t* hw_module = NULL;		const hw_module_t* hw_module = NULL;
	power_module_t *power_module;		power_module_t *power_module;
	ret = hw_get_module(name, &hw_module);		ret = hw_get_module(POWER_HARDWARE_MODULE_ID, &hw_module);
	if (ret == 0 && hw_module->methods->open) {		if (ret == 0 && hw_module->methods->open) {
	ret = hw_module->methods->open(hw_module, name,		ret = hw_module->methods->open(hw_module, POWER_HARDWARE_MODULE_ID,
	reinterpret_cast<hw_device_t**>(&power_module));		reinterpret_cast<hw_device_t**>(&power_module));
	if (ret == 0) {		if (ret == 0) {
	return new Power(power_module);		return new Power(power_module);
	}		}
	else {		else {
	ALOGE("Passthrough failed to load legacy HAL.");		ALOGE("Passthrough failed to load legacy power HAL.");
	return nullptr;		return nullptr;
	}		}
	}		}
	else {		else {
	ALOGE ("hw_get_module %s failed: %d", name, ret);		ALOGE ("hw_get_module %s failed: %d", POWER_HARDWARE_MODULE_ID, ret);
	return nullptr;		return nullptr;
	}		}
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,5 +23,5 @@ using android::hardware::power::V1_0::IPower;
	using android::hardware::defaultPassthroughServiceImplementation;		using android::hardware::defaultPassthroughServiceImplementation;

	int main() {		int main() {
	return defaultPassthroughServiceImplementation<IPower>("power");		return defaultPassthroughServiceImplementation<IPower>();
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ using ::android::sp;
	class PowerHidlTest : public ::testing::Test {		class PowerHidlTest : public ::testing::Test {
	public:		public:
	virtual void SetUp() override {		virtual void SetUp() override {
	power = IPower::getService("power");		power = IPower::getService();
	ASSERT_NE(power, nullptr);		ASSERT_NE(power, nullptr);
	}		}