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

Commit df812255 authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent e566dd69

apex/sdkextensions/derive_sdk/derive_sdk.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

    }

    }





    /**

    /**