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

Commit 0050bef9 authored by David Anderson's avatar David Anderson
Browse files

Warn loudly if using deprecated ueventd paths. 

Bug: 189268918
Test: treehugger
Change-Id: Ib4cfa4f3a1f4626afcd37278d93390ad34b0216b
parent 7c8ec7b3

init/ueventd.cpp

+18 −5
Original line number Diff line number Diff line
@@ -268,14 +268,27 @@ void ColdBoot::Run() { 
}



static UeventdConfiguration GetConfiguration() {

    // TODO: Remove these legacy paths once Android S is no longer supported.

    if (android::base::GetIntProperty("ro.product.first_api_level", 10000) <= __ANDROID_API_S__) {

    auto hardware = android::base::GetProperty("ro.hardware", "");

        return ParseConfig({"/system/etc/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc",

                            "/ueventd." + hardware + ".rc"});

    std::vector<std::string> legacy_paths{"/vendor/ueventd.rc", "/odm/ueventd.rc",

                                          "/ueventd." + hardware + ".rc"};



    std::vector<std::string> canonical{"/system/etc/ueventd.rc"};



    if (android::base::GetIntProperty("ro.product.first_api_level", 10000) <= __ANDROID_API_S__) {

        // TODO: Remove these legacy paths once Android S is no longer supported.

        canonical.insert(canonical.end(), legacy_paths.begin(), legacy_paths.end());

    } else {

        // Warn if newer device is using legacy paths.

        for (const auto& path : legacy_paths) {

            if (access(path.c_str(), F_OK) == 0) {

                LOG(FATAL_WITHOUT_ABORT)

                        << "Legacy ueventd configuration file detected and will not be parsed: "

                        << path;

            }

        }

    }



    return ParseConfig({"/system/etc/ueventd.rc"});

    return ParseConfig(canonical);

}



int ueventd_main(int argc, char** argv) {