Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove "ro." prefix from sdk extension props" am: 57c17a8136

Browse Source 
Change-Id: I0dda2c3463257bfecee1fd52e607ffbad38c6646
This commit is contained in:
Automerger Merge Worker
2020-02-08 11:43:59 +00:00
parent 3f04483102 57c17a8136
commit aae4da8fd3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/sdkextensions/derive_sdk/derive_sdk.cpp
View File

@@ -69,7 +69,7 @@ int main(int, char**) {
auto itr = std::min_element(versions.begin(), versions.end()); auto itr = std::min_element(versions.begin(), versions.end());
std::string prop_value = itr == versions.end() ? "0" : std::to_string(*itr); std::string prop_value = itr == versions.end() ? "0" : std::to_string(*itr);
if (!android::base::SetProperty("ro.build.version.extensions.r", prop_value)) { if (!android::base::SetProperty("build.version.extensions.r", prop_value)) {
LOG(ERROR) << "failed to set sdk_info prop"; LOG(ERROR) << "failed to set sdk_info prop";
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java
View File

@@ -38,7 +38,7 @@ public class SdkExtensions {
private static final int R_EXTENSION_INT; private static final int R_EXTENSION_INT;
static { static {
R_EXTENSION_INT = SystemProperties.getInt("ro.build.version.extensions.r", 0); R_EXTENSION_INT = SystemProperties.getInt("build.version.extensions.r", 0);
} }
/** /**