Merge "Skip initializing ro.vendor.api_level if already defined" into main
diff --git a/init/property_service.cpp b/init/property_service.cpp
index bc4ef42..9249d58 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1090,6 +1090,12 @@
// required to support.
constexpr auto VENDOR_API_LEVEL_PROP = "ro.vendor.api_level";
+ if (__system_property_find(VENDOR_API_LEVEL_PROP) != nullptr) {
+ // The device already have ro.vendor.api_level in its vendor/build.prop.
+ // Skip initializing the ro.vendor.api_level property.
+ return;
+ }
+
auto vendor_api_level = GetIntProperty("ro.board.first_api_level", __ANDROID_VENDOR_API_MAX__);
if (vendor_api_level != __ANDROID_VENDOR_API_MAX__) {
// Update the vendor_api_level with "ro.board.api_level" only if both "ro.board.api_level"