Merge "Tolerate missing power HAL module." into jb-dev (f3ae4e17) · Commits · e / os / android_frameworks_base

services/jni/com_android_server_PowerManagerService.cpp

+7 −14

Original line number	Diff line number	Diff line
		@@ -83,12 +83,10 @@ bool android_server_PowerManagerService_isScreenBright() {
		}

		void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t eventType) {
		if (gPowerModule) {
		// Tell the power HAL when user activity occurs.
		if (gPowerModule->powerHint) {
		if (gPowerModule && gPowerModule->powerHint) {
		gPowerModule->powerHint(gPowerModule, POWER_HINT_INTERACTION, NULL);
		}
		}

		if (gPowerManagerServiceObj) {
		// Throttle calls into user activity by event type.
		@@ -131,16 +129,11 @@ static void nativeInit(JNIEnv* env, jobject obj) {

		status_t err = hw_get_module(POWER_HARDWARE_MODULE_ID,
		(hw_module_t const**)&gPowerModule);
		if (err) {
		String8 msg;
		msg.appendFormat("Couldn't load %s module (%s)",
		POWER_HARDWARE_MODULE_ID, strerror(-err));
		ALOGE("%s", msg.string());
		jniThrowRuntimeException(env, msg.string());
		return;
		}

		if (!err) {
		gPowerModule->init(gPowerModule);
		} else {
		ALOGE("Couldn't load %s module (%s)", POWER_HARDWARE_MODULE_ID, strerror(-err));
		}
		}

		static void nativeSetPowerState(JNIEnv* env,