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

Merge "Use ro.build.version.extensions.r" am: c410209ec3 am: 9af25780ca

Browse Source 
Change-Id: I67e4d47d5b11adbae788e5892bdbec53a4f6e77b
This commit is contained in:
Automerger Merge Worker
2019-12-11 17:10:03 +00:00
parent 2f90e05834 9af25780ca
commit a89b70f3b5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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