diff options
| author | David Anderson <dvander@google.com> | 2022-04-15 20:58:51 -0700 |
|---|---|---|
| committer | Matt Lee <matthewhlee@google.com> | 2022-04-19 11:39:48 -0700 |
| commit | 19f7d7b7d89830f6ffb34f335b6a567d8766af6c (patch) | |
| tree | 4091df29165b1a3cedf2d6379d264f409902df0f | |
| parent | 73c1b85e437bad34e9056c830336aa95f1c919c3 (diff) | |
ueventd: Allow legacy paths in API version 32.
Note: Since there is no __ANDROID_API_T__ in this branch, and no api
define for 32, we have to hardcode the number.
Bug: 226699360
Bug: 226699360
Test: manual test
Change-Id: I2602eaa217a2b6cba8a5fb8acd6d5a8a9e3d405e
(cherry picked from commit 3a364add0b264ea5446d7bd984509c65b6aca97c)
| -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"}); |