From 08534b8d0b847ca3c05b036b32517664059cf501 Mon Sep 17 00:00:00 2001 From: Massimo Carli Date: Thu, 7 Dec 2023 09:19:24 +0000 Subject: [PATCH] Revert "Calculate ro.vendor.api_level with the new vendor API format" This reverts commit e267e31d73dc67dd617dfe848169bf78e5ac0b42. Reason for revert: b/315246126 Change-Id: I456858c6f4c528158c0826efcdc1509b701c32f7 --- init/property_service.cpp | 49 ++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/init/property_service.cpp b/init/property_service.cpp index e2cff957e..bd7435819 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -84,7 +84,6 @@ using namespace std::literals; using android::base::ErrnoError; using android::base::Error; -using android::base::GetIntProperty; using android::base::GetProperty; using android::base::ParseInt; using android::base::ReadFileToString; @@ -113,7 +112,7 @@ constexpr auto ID_PROP = "ro.build.id"; constexpr auto LEGACY_ID_PROP = "ro.build.legacy.id"; constexpr auto VBMETA_DIGEST_PROP = "ro.boot.vbmeta.digest"; constexpr auto DIGEST_SIZE_USED = 8; -constexpr auto MAX_VENDOR_API_LEVEL = 1000000; +constexpr auto API_LEVEL_CURRENT = 10000; static bool persistent_properties_loaded = false; @@ -1085,16 +1084,15 @@ static void property_initialize_ro_cpu_abilist() { } } -static int vendor_api_level_of(int sdk_api_level) { - if (sdk_api_level < __ANDROID_API_V__) { - return sdk_api_level; +static int read_api_level_props(const std::vector& api_level_props) { + int api_level = API_LEVEL_CURRENT; + for (const auto& api_level_prop : api_level_props) { + api_level = android::base::GetIntProperty(api_level_prop, API_LEVEL_CURRENT); + if (api_level != API_LEVEL_CURRENT) { + break; + } } - // In Android V, vendor API level started with version 202404. - // The calculation assumes that the SDK api level bumps once a year. - if (sdk_api_level < __ANDROID_API_FUTURE__) { - return 202404 + ((sdk_api_level - __ANDROID_API_V__) * 100); - } - return MAX_VENDOR_API_LEVEL; + return api_level; } static void property_initialize_ro_vendor_api_level() { @@ -1102,27 +1100,20 @@ static void property_initialize_ro_vendor_api_level() { // required to support. constexpr auto VENDOR_API_LEVEL_PROP = "ro.vendor.api_level"; - auto vendor_api_level = GetIntProperty("ro.board.first_api_level", MAX_VENDOR_API_LEVEL); - if (vendor_api_level != MAX_VENDOR_API_LEVEL) { - // Update the vendor_api_level with "ro.board.api_level" only if both "ro.board.api_level" - // and "ro.board.first_api_level" are defined. - vendor_api_level = GetIntProperty("ro.board.api_level", vendor_api_level); - } - - auto product_first_api_level = - GetIntProperty("ro.product.first_api_level", __ANDROID_API_FUTURE__); - if (product_first_api_level == __ANDROID_API_FUTURE__) { - // Fallback to "ro.build.version.sdk" if the "ro.product.first_api_level" is not defined. - product_first_api_level = GetIntProperty("ro.build.version.sdk", __ANDROID_API_FUTURE__); - } - - vendor_api_level = std::min(vendor_api_level_of(product_first_api_level), vendor_api_level); + // Api level properties of the board. The order of the properties must be kept. + std::vector BOARD_API_LEVEL_PROPS = {"ro.board.api_level", + "ro.board.first_api_level"}; + // Api level properties of the device. The order of the properties must be kept. + std::vector DEVICE_API_LEVEL_PROPS = {"ro.product.first_api_level", + "ro.build.version.sdk"}; + int api_level = std::min(read_api_level_props(BOARD_API_LEVEL_PROPS), + read_api_level_props(DEVICE_API_LEVEL_PROPS)); std::string error; - auto res = PropertySetNoSocket(VENDOR_API_LEVEL_PROP, std::to_string(vendor_api_level), &error); + auto res = PropertySetNoSocket(VENDOR_API_LEVEL_PROP, std::to_string(api_level), &error); if (res != PROP_SUCCESS) { - LOG(ERROR) << "Failed to set " << VENDOR_API_LEVEL_PROP << " with " << vendor_api_level - << ": " << error << "(" << res << ")"; + LOG(ERROR) << "Failed to set " << VENDOR_API_LEVEL_PROP << " with " << api_level << ": " + << error << "(" << res << ")"; } }