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

Commit 7d4f1a6e authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "ueventd: suggest move location for ueventd config" am: d438ea72 am: 49ec1df6 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2070481



Change-Id: I6d7e9994f3678ceb862d34422a7383107835186a
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8dfb847 49ec1df6

init/ueventd.cpp

+16 −6
Original line number Diff line number Diff line
@@ -298,21 +298,31 @@ void ColdBoot::Run() { 


static UeventdConfiguration GetConfiguration() {

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

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

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



    struct LegacyPathInfo {

        std::string legacy_path;

        std::string preferred;

    };

    std::vector<LegacyPathInfo> legacy_paths{

            {"/vendor/ueventd.rc", "/vendor/etc/ueventd.rc"},

            {"/odm/ueventd.rc", "/odm/etc/ueventd.rc"},

            {"/ueventd." + hardware + ".rc", "another ueventd.rc file"}};



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



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

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

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

        for (const auto& info : legacy_paths) {

            canonical.push_back(info.legacy_path);

        }

    } else {

        // Warn if newer device is using legacy paths.

        for (const auto& path : legacy_paths) {

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

        for (const auto& info : legacy_paths) {

            if (access(info.legacy_path.c_str(), F_OK) == 0) {

                LOG(FATAL_WITHOUT_ABORT)

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

                        << path;

                        << info.legacy_path << ". Please move your configuration to "

                        << info.preferred << " instead.";

            }

        }

    }