commit 2495a652412f98b8c8f1a60241a650d4d45a7eea
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 14 02:16:16 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 02:16:17 2017 +0000
tree a5dd807c4f57f2780dee62175edd496921cd57df
parent 681f3c36adfdadce39dbcfab09be1346349c95fd
parent 7e71a0cfcb001a1c08144facf9d667ebb4078ca7

Merge "fix a sign-compare warning and use -Wall"

power/1.0/default/Android.bp

diff --git a/power/1.0/default/Android.bp b/power/1.0/default/Android.bp
index 91b9225..71daaeb 100644
--- a/power/1.0/default/Android.bp
+++ b/power/1.0/default/Android.bp
@@ -18,6 +18,11 @@
     relative_install_path: "hw",
     srcs: ["Power.cpp"],
 
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+
     shared_libs: [
         "liblog",
         "libhardware",
@@ -37,6 +42,11 @@
     init_rc: ["android.hardware.power@1.0-service.rc"],
     srcs: ["service.cpp"],
 
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+
     shared_libs: [
         "liblog",
         "libdl",

power/1.0/default/Power.cpp

diff --git a/power/1.0/default/Power.cpp b/power/1.0/default/Power.cpp
index 2ddac0a..6ea9167 100644
--- a/power/1.0/default/Power.cpp
+++ b/power/1.0/default/Power.cpp
@@ -81,7 +81,7 @@
     number_platform_modes = mModule->get_number_of_platform_modes(mModule);
     if (number_platform_modes)
     {
-       if (SIZE_MAX / sizeof(size_t) <= number_platform_modes)  // overflow
+       if ((ssize_t) (SIZE_MAX / sizeof(size_t)) <= number_platform_modes)  // overflow
            goto done;
        voters = new (std::nothrow) size_t [number_platform_modes];
        if (voters == nullptr)
@@ -91,7 +91,7 @@
        if (ret != 0)
            goto done;
 
-       if (SIZE_MAX / sizeof(power_state_platform_sleep_state_t)
+       if ((ssize_t) (SIZE_MAX / sizeof(power_state_platform_sleep_state_t))
            <= number_platform_modes)  // overflow
            goto done;
        legacy_states = new (std::nothrow)