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

Commit 9097c5ea authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "ueventd: Allow legacy paths in API version 32." am: 48d403a5 am: 7ce7ea09 

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



Change-Id: I0cad070975c74c1a4814f0e434f93ad81f6e676e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cafbb68 7ce7ea09

init/ueventd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static UeventdConfiguration GetConfiguration() { 


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



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

    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());

    } else {