Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2495a652 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 681f3c36 7e71a0cf

power/1.0/default/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ cc_library_shared { 
    relative_install_path: "hw",

    srcs: ["Power.cpp"],



    cflags: [

        "-Wall",

        "-Werror",

    ],



    shared_libs: [

        "liblog",

        "libhardware",
@@ -37,6 +42,11 @@ cc_binary { 
    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

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ Return<void> Power::getPlatformLowPowerStats(getPlatformLowPowerStats_cb _hidl_c 
    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 @@ Return<void> Power::getPlatformLowPowerStats(getPlatformLowPowerStats_cb _hidl_c 
       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)