diff --git a/services/core/jni/com_android_server_power_PowerManagerService.cpp b/services/core/jni/com_android_server_power_PowerManagerService.cpp
index 3ee2b16169abe..dbf5439a9aff5 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);
+        }
     }
 }