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

Commit 7477c963 authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by android-build-merger
Browse files

Merge "light: Allow blank_screen utiltiy to get color from command line" am:... 

Merge "light: Allow blank_screen utiltiy to get color from command line" am: 57487311 am: d3fe96d9 am: e7f1639d
am: 2f4489b2

Change-Id: I59e3f250da9cb8afbd4ea1c9a778021f4805bdcf
parents a6075ea5 2f4489b2

light/utils/main.cpp

+22 −3
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ void error(const std::string& msg) { 
    std::cerr << msg << std::endl;

    std::cerr << msg << std::endl;

}

}





int main() {

int main(int argc, char* argv[]) {

    using ::android::hardware::hidl_vec;

    using ::android::hardware::hidl_vec;

    using ::android::hardware::light::V2_0::Brightness;

    using ::android::hardware::light::V2_0::Brightness;

    using ::android::hardware::light::V2_0::Flash;

    using ::android::hardware::light::V2_0::Flash;
@@ -41,10 +41,29 @@ int main() { 
        return -1;

        return -1;

    }

    }





    const static LightState off = {

    static LightState off = {

        .color = 0u, .flashMode = Flash::NONE, .brightnessMode = Brightness::USER,

            .color = 0u,

            .flashMode = Flash::NONE,

            .brightnessMode = Brightness::USER,

    };

    };





    if (argc > 2) {

        error("Usage: blank_screen [color]");

        return -1;

    }



    if (argc > 1) {

        char* col_ptr;

        unsigned int col_new;



        col_new = strtoul(argv[1], &col_ptr, 0);

        if (*col_ptr != '\0') {

            error("Failed to convert " + std::string(argv[1]) + " to number");

            return -1;

        }

        off.color = col_new;

    }



    service->getSupportedTypes([&](const hidl_vec<Type>& types) {

    service->getSupportedTypes([&](const hidl_vec<Type>& types) {

        for (Type type : types) {

        for (Type type : types) {

            Status ret = service->setLight(type, off);

            Status ret = service->setLight(type, off);