summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2022-04-29 20:39:44 -0700
committerLinux Build Service Account <lnxbuild@localhost>2022-04-29 20:39:44 -0700
commitcb9c7554c206a53fad96ad175e182cbaf94c7dc1 (patch)
tree70acba84ee6b678bc569632acd4a9ee174e6f608
parent8fc3f7296741ce589f7294113f8771837fb49bda (diff)
parent6086fd5daa72aa534d75439c81d36e2e3fde585b (diff)
Merge 6086fd5daa72aa534d75439c81d36e2e3fde585b on remote branch
Change-Id: I75306aee722e8098dc11571361f1b9e1222223bd
-rw-r--r--init/ueventd.cpp2
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"});