Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f3ae4e17: Merge "Tolerate missing power HAL module." into jb-dev

Browse Source 
* commit 'f3ae4e178c8e5111f24927bbc43a7d73d03c8501':
  Tolerate missing power HAL module.
This commit is contained in:
Jeff Brown
2012-05-16 16:27:04 -07:00
committed by Android Git Automerger
parent 046c861916 f3ae4e178c
commit 00c53eb6ad
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/jni/com_android_server_PowerManagerService.cpp
View File

@@ -83,11 +83,9 @@ 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) {
gPowerModule->powerHint(gPowerModule, POWER_HINT_INTERACTION, NULL);
}
// Tell the power HAL when user activity occurs.
if (gPowerModule && gPowerModule->powerHint) {
gPowerModule->powerHint(gPowerModule, POWER_HINT_INTERACTION, NULL);
}
if (gPowerManagerServiceObj) {
@@ -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));
}
gPowerModule->init(gPowerModule);
}
static void nativeSetPowerState(JNIEnv* env,