ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Calculate ro.vendor.api_level with the new vendor API format" into main am: 698c6f9035

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2839486

Change-Id: I146f0afe3feea591548ff373fbac9bb8ade70b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Yun 2023-12-07 04:30:18 +00:00 • committed by Automerger Merge Worker
commit dfeb7be11f
1 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
init/property_service.cpp
View file

@ -84,6 +84,7 @@ using namespace std::literals;
using android::base::ErrnoError; using android::base::ErrnoError;
using android::base::Error; using android::base::Error;
using android::base::GetIntProperty;
using android::base::GetProperty; using android::base::GetProperty;
using android::base::ParseInt; using android::base::ParseInt;
using android::base::ReadFileToString; using android::base::ReadFileToString;
@ -112,7 +113,7 @@ constexpr auto ID_PROP = "ro.build.id";
constexpr auto LEGACY_ID_PROP = "ro.build.legacy.id"; constexpr auto LEGACY_ID_PROP = "ro.build.legacy.id";
constexpr auto VBMETA_DIGEST_PROP = "ro.boot.vbmeta.digest"; constexpr auto VBMETA_DIGEST_PROP = "ro.boot.vbmeta.digest";
constexpr auto DIGEST_SIZE_USED = 8; constexpr auto DIGEST_SIZE_USED = 8;
constexpr auto API_LEVEL_CURRENT = 10000; constexpr auto MAX_VENDOR_API_LEVEL = 1000000;
static bool persistent_properties_loaded = false; static bool persistent_properties_loaded = false;
@ -1084,15 +1085,16 @@ static void property_initialize_ro_cpu_abilist() {
} }
} }
static int read_api_level_props(const std::vector<std::string>& api_level_props) { static int vendor_api_level_of(int sdk_api_level) {
int api_level = API_LEVEL_CURRENT; if (sdk_api_level < __ANDROID_API_V__) {
for (const auto& api_level_prop : api_level_props) { return sdk_api_level;
api_level = android::base::GetIntProperty(api_level_prop, API_LEVEL_CURRENT);
if (api_level != API_LEVEL_CURRENT) {
break;
}
} }
return api_level; // 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;
} }
static void property_initialize_ro_vendor_api_level() { static void property_initialize_ro_vendor_api_level() {
@ -1100,20 +1102,27 @@ static void property_initialize_ro_vendor_api_level() {
// required to support. // required to support.
constexpr auto VENDOR_API_LEVEL_PROP = "ro.vendor.api_level"; constexpr auto VENDOR_API_LEVEL_PROP = "ro.vendor.api_level";
// Api level properties of the board. The order of the properties must be kept. auto vendor_api_level = GetIntProperty("ro.board.first_api_level", MAX_VENDOR_API_LEVEL);
std::vector<std::string> BOARD_API_LEVEL_PROPS = {"ro.board.api_level", if (vendor_api_level != MAX_VENDOR_API_LEVEL) {
"ro.board.first_api_level"}; // Update the vendor_api_level with "ro.board.api_level" only if both "ro.board.api_level"
// Api level properties of the device. The order of the properties must be kept. // and "ro.board.first_api_level" are defined.
std::vector<std::string> DEVICE_API_LEVEL_PROPS = {"ro.product.first_api_level", vendor_api_level = GetIntProperty("ro.board.api_level", vendor_api_level);
"ro.build.version.sdk"}; }
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);
int api_level = std::min(read_api_level_props(BOARD_API_LEVEL_PROPS),
read_api_level_props(DEVICE_API_LEVEL_PROPS));
std::string error; std::string error;
auto res = PropertySetNoSocket(VENDOR_API_LEVEL_PROP, std::to_string(api_level), &error); auto res = PropertySetNoSocket(VENDOR_API_LEVEL_PROP, std::to_string(vendor_api_level), &error);
if (res != PROP_SUCCESS) { if (res != PROP_SUCCESS) {
LOG(ERROR) << "Failed to set " << VENDOR_API_LEVEL_PROP << " with " << api_level << ": " LOG(ERROR) << "Failed to set " << VENDOR_API_LEVEL_PROP << " with " << vendor_api_level
<< error << "(" << res << ")"; << ": " << error << "(" << res << ")";
} }
} }