diff options
| author | Matt Lee <matthewhlee@google.com> | 2022-04-19 22:41:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-04-19 22:41:28 +0000 |
| commit | a3a7e59704a48c41e40bae13ceadc4cf8c76a7bf (patch) | |
| tree | 70acba84ee6b678bc569632acd4a9ee174e6f608 | |
| parent | cb706d277b521508bdd037b78379c1c6a635f6e6 (diff) | |
| parent | 19f7d7b7d89830f6ffb34f335b6a567d8766af6c (diff) | |
Merge "ueventd: Allow legacy paths in API version 32." into s-keystone-qcom-dev
| -rw-r--r-- | init/ueventd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/ueventd.cpp b/init/ueventd.cpp index 331255b1e..1b0b0daa8 100644 --- a/init/ueventd.cpp +++ b/init/ueventd.cpp @@ -269,7 +269,7 @@ 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__) { + if (android::base::GetIntProperty("ro.product.first_api_level", 10000) < 33) { auto hardware = android::base::GetProperty("ro.hardware", ""); return ParseConfig({"/system/etc/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc", "/ueventd." + hardware + ".rc"}); |