From df812255396eae83dd2d59034ecc70f82a431a50 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 7 Feb 2020 19:05:33 +0000 Subject: [PATCH] Remove "ro." prefix from sdk extension props It needs to be reset during userspace reboot, so isn't readonly. Bug: 148668435 Test: presubmit Change-Id: I3140221d431a1ce97007b5cf36f6d1bc4aa4f771 --- apex/sdkextensions/derive_sdk/derive_sdk.cpp | 2 +- .../framework/java/android/os/ext/SdkExtensions.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apex/sdkextensions/derive_sdk/derive_sdk.cpp b/apex/sdkextensions/derive_sdk/derive_sdk.cpp index 6fb7ef43416e..900193a6bd0d 100644 --- a/apex/sdkextensions/derive_sdk/derive_sdk.cpp +++ b/apex/sdkextensions/derive_sdk/derive_sdk.cpp @@ -69,7 +69,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("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"; return EXIT_FAILURE; } diff --git a/apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java b/apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java index a8a7effa9b6c..103b53e81db5 100644 --- a/apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java +++ b/apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java @@ -38,7 +38,7 @@ public class SdkExtensions { private static final int R_EXTENSION_INT; static { - R_EXTENSION_INT = SystemProperties.getInt("ro.build.version.extensions.r", 0); + R_EXTENSION_INT = SystemProperties.getInt("build.version.extensions.r", 0); } /**