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

Commit 6c61e087 authored by Keun-young Park's avatar Keun-young Park Committed by android-build-merger
Browse files

Merge "set default shutdown timeout to 6 secs" am: 47d15ed5 am: 0020d4c0 

am: 09c780db

Change-Id: I38ec920f5034b2adc9ab8354144cae1fe554d753
parents 2a53c3ed 09c780db

init/reboot.cpp

+1 −2
Original line number Diff line number Diff line
@@ -318,8 +318,7 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re 
        abort();

    }



    /* TODO update default waiting time based on usage data */

    constexpr unsigned int shutdownTimeoutDefault = 10;

    constexpr unsigned int shutdownTimeoutDefault = 6;

    unsigned int shutdownTimeout = shutdownTimeoutDefault;

    if (SHUTDOWN_ZERO_TIMEOUT) {  // eng build

        shutdownTimeout = 0;