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

Commit d0b57f79 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Android (Google) Code Review
Browse files

Merge changes from topic "introduce-RELEASE_PLATFORM_SDK_FULL_VERSION" into main 

* changes:
  [Ravenwood] Support ro.build.version.sdk_full
  Replace ro.build.version.sdk_minor with ro.build.version.sdk_full
parents 737c3b32 192b1d06

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

ravenwood/texts/ravenwood-build.prop

+1 −0
Original line number Diff line number Diff line
@@ -42,3 +42,4 @@ ro.build.version.release=$$$ro.build.version.release 
ro.build.version.release_or_codename=$$$ro.build.version.release_or_codename

ro.build.version.release_or_preview_display=$$$ro.build.version.release_or_preview_display

ro.build.version.sdk=$$$ro.build.version.sdk

ro.build.version.sdk_full=$$$ro.build.version.sdk_full