Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8ac5fa1 authored Dec 09, 2019 by Anton Hansson

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

parent 67dfdbc9

apex/sdkext/derive_sdk/derive_sdk.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

apex/sdkext/framework/java/android/os/ext/SdkExtensions.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**