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

Commit 8debd467 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

Replace ro.build.version.sdk_minor with ro.build.version.sdk_full 

Keep ro.build.version.sdk for backwards compatibility.

Bug: 380235511
Test: atest CtsOsTestCases:BuildTest
Flag: android.sdk.major_minor_versioning_scheme
Change-Id: I607b509557f089d29076fd198808be98301bd5a7
parent 559895c2

core/java/android/os/Build.java

+2 −7
Original line number Diff line number Diff line
@@ -431,13 +431,8 @@ public class Build { 
         * android.os.Build.VERSION_CODES_FULL}.

         */

        @FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)

        public static final int SDK_INT_FULL;



        static {

            SDK_INT_FULL = VERSION_CODES_FULL.SDK_INT_MULTIPLIER

                * SystemProperties.getInt("ro.build.version.sdk", 0)

                + SystemProperties.getInt("ro.build.version.sdk_minor", 0);

        }

        public static final int SDK_INT_FULL = parseFullVersion(SystemProperties.get(

                    "ro.build.version.sdk_full", ""));



        /**

         * The SDK version of the software that <em>initially</em> shipped on