Merge "ueventd: Allow legacy paths in API version 32." am: 48d403a511 am: 7ce7ea098b

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

Change-Id: I0cad070975c74c1a4814f0e434f93ad81f6e676e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2022-03-30 22:24:35 +00:00 committed by Automerger Merge Worker
commit 9097c5ea60

View file

@ -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 {