Merge "Skip initializing ro.vendor.api_level if already defined" into main

This commit is contained in:
Treehugger Robot 2024-03-07 03:42:14 +00:00 committed by Gerrit Code Review
commit 6c6b9e33d6

View file

@ -1090,6 +1090,12 @@ static void property_initialize_ro_vendor_api_level() {
// 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"