commit 99af9ddba7813683fecefad354ed3b77c123c293
author Treehugger Robot <treehugger-gerrit@google.com> Sat Apr 16 04:10:41 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 16 04:10:41 2022 +0000
tree 25bc68d657ae678284cfa99d3bfb1539e7edb734
parent 71429a9738471920772df0d5d50a820aa0d50fbe
parent 3a364add0b264ea5446d7bd984509c65b6aca97c

Merge "ueventd: Allow legacy paths in API version 32." into android12L-dev

init/ueventd.cpp

diff --git a/init/ueventd.cpp b/init/ueventd.cpp
index 331255b..1b0b0da 100644
--- a/init/ueventd.cpp
+++ b/init/ueventd.cpp
@@ -269,7 +269,7 @@
 
 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"});