From d8ac5fa1b2f2e586b2814b3493cfac89afb6e4b2 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 9 Dec 2019 17:16:13 +0000 Subject: Use ro.build.version.extensions.r The sdk_info prop is mostly there as a communication channel if we need to channel more information in the future. For now, using ro.build.version.extensions.r (which is "stable") is sufficient. Bug: 137191822 Test: boot and getprop ro.build.version.extensions.r Change-Id: I630c235fd98eaeda9086fa490914e56556b18706 --- apex/sdkext/derive_sdk/derive_sdk.cpp | 2 +- apex/sdkext/framework/java/android/os/ext/SdkExtensions.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apex/sdkext/derive_sdk/derive_sdk.cpp b/apex/sdkext/derive_sdk/derive_sdk.cpp index 0aacebefaaca..7536def60767 100644 --- a/apex/sdkext/derive_sdk/derive_sdk.cpp +++ b/apex/sdkext/derive_sdk/derive_sdk.cpp @@ -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; } diff --git a/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java b/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java index 331ef21935bb..d3b9397d45f2 100644 --- a/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java +++ b/apex/sdkext/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("persist.com.android.sdkext.sdk_info", 0); + R_EXTENSION_INT = SystemProperties.getInt("ro.build.version.extensions.r", 0); } /** -- cgit v1.2.3-59-g8ed1b