diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2014-04-04 23:40:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 23:40:47 +0000 |
| commit | 38915a1c4c4377ee99ff1fb25995a0c5f7bd614f (patch) | |
| tree | d1d802c6b74dd107324da053b8c4dcb025ca9e79 /services | |
| parent | 652772899918a5d59691a290c98ef1dd55c32b7d (diff) | |
| parent | 654d75fec9e04306a3e08e4ef0c3aa0ec9ef96ea (diff) | |
| download | frameworks_base-38915a1c4c4377ee99ff1fb25995a0c5f7bd614f.zip frameworks_base-38915a1c4c4377ee99ff1fb25995a0c5f7bd614f.tar.gz frameworks_base-38915a1c4c4377ee99ff1fb25995a0c5f7bd614f.tar.bz2 | |
am 654d75fe: PowerManager: Fix build
* commit '654d75fec9e04306a3e08e4ef0c3aa0ec9ef96ea':
PowerManager: Fix build
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/jni/com_android_server_power_PowerManagerService.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/core/jni/com_android_server_power_PowerManagerService.cpp b/services/core/jni/com_android_server_power_PowerManagerService.cpp index 3ee2b16..dbf5439 100644 --- a/services/core/jni/com_android_server_power_PowerManagerService.cpp +++ b/services/core/jni/com_android_server_power_PowerManagerService.cpp @@ -190,8 +190,14 @@ static void nativeSetAutoSuspend(JNIEnv *env, jclass clazz, jboolean enable) { } static void nativeSendPowerHint(JNIEnv *env, jclass clazz, jint hintId, jint data) { + int data_param = data; + if (gPowerModule && gPowerModule->powerHint) { - gPowerModule->powerHint(gPowerModule, (power_hint_t)hintId, (void *)data); + if(data) + gPowerModule->powerHint(gPowerModule, (power_hint_t)hintId, &data_param); + else { + gPowerModule->powerHint(gPowerModule, (power_hint_t)hintId, NULL); + } } } |