commit 16f56e8c65cd668a5db6b4dae0ae7cfe0b95bef7
author Wei Wang <wvw@google.com> Wed Jan 11 01:16:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 11 01:16:26 2017 +0000
tree b7456c148ccd5e3c0213e4bc119f579e0654a096
parent 3cb3b55ca4e1e9b341839e12342e1ec9c0842ed8
parent e0c1bbbe6d80bd7c3d266d36d18e87dd93bf98e1

Merge "Fix powerhint for NULL parameter"

power/1.0/default/Power.cpp

diff --git a/power/1.0/default/Power.cpp b/power/1.0/default/Power.cpp
index 6453f33..29594eb 100644
--- a/power/1.0/default/Power.cpp
+++ b/power/1.0/default/Power.cpp
@@ -44,8 +44,12 @@
 
 Return<void> Power::powerHint(PowerHint hint, int32_t data)  {
     int32_t param = data;
-    if (mModule->powerHint > 0)
-        mModule->powerHint(mModule, static_cast<power_hint_t>(hint), &param);
+    if (mModule->powerHint > 0) {
+        if (data)
+            mModule->powerHint(mModule, static_cast<power_hint_t>(hint), &param);
+        else
+            mModule->powerHint(mModule, static_cast<power_hint_t>(hint), NULL);
+    }
     return Void();
 }