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

Commit 31db4731 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

Rework SDK_MINOR_INT -> SDK_INT_FULL 

Change how minor release codes are encoded in Build.java. Instead of
a new int representing the minor version, which always needs to be
combined with SDK_INT, change SDK_MINOR_INT to become SDK_INT_FULL which
encodes both major and minor versions. This reduces the risk of
confusing the integers, simplifies version checks and is better for Lint
and the docs.

Bug: 350458259
Test: atest 'CtsOsTestCases:BuildTest#testSdkIntFull'
Flag: android.sdk.major_minor_versioning_scheme
Change-Id: I4373e846f572aedd2f48af17c8d60aea80c42b2e
parent f949e8ff

core/api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -32771,7 +32771,7 @@ package android.os { 
    field @NonNull public static final String RELEASE_OR_PREVIEW_DISPLAY;

    field @Deprecated public static final String SDK;

    field public static final int SDK_INT;

    field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int SDK_MINOR_INT;

    field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int SDK_INT_FULL;

    field public static final String SECURITY_PATCH;

  }










@@ -32815,6 +32815,9 @@ package android.os {













    field public static final int VANILLA_ICE_CREAM = 35; // 0x23















  }



























  @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static class Build.VERSION_CODES_FULL {













  }



























  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {















    ctor public Bundle();















    ctor public Bundle(ClassLoader);

























core/java/android/os/Build.java



+46
−17




























Original line number
Diff line number
Diff line








@@ -22,6 +22,7 @@ import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.RequiresPermission;















import android.annotation.SuppressAutoDoc;













import android.annotation.SuppressLint;















import android.annotation.SystemApi;















import android.annotation.TestApi;















import android.app.ActivityThread;










@@ -401,33 +402,42 @@ public class Build {













         * device. This value never changes while a device is booted, but it may















         * increase when the hardware manufacturer provides an OTA update.















         * <p>













         * Together with {@link SDK_MINOR_INT}, this constant defines the













         * <pre>major.minor</pre> version of Android. <pre>SDK_INT</pre> is













         * increased and <pre>SDK_MINOR_INT</pre> is set to 0 on new Android













         * dessert releases. Between these, Android may also release so called













         * minor releases where <pre>SDK_INT</pre> remains unchanged and













         * <pre>SDK_MINOR_INT</pre> is increased. Minor releases can add new













         * APIs, and have stricter guarantees around backwards compatibility













         * (e.g. no changes gated by <pre>targetSdkVersion</pre>) compared to













         * major releases.













         * This constant records the major version of Android. Use {@link













         * SDK_INT_FULL} if you need to consider the minor version of Android













         * as well.















         * <p>















         * Possible values are defined in {@link Build.VERSION_CODES}.













         * @see #SDK_INT_FULL















         */















        public static final int SDK_INT = SystemProperties.getInt(















                "ro.build.version.sdk", 0);































        /**













         * The minor SDK version of the software currently running on this hardware













         * device. This value never changes while a device is booted, but it may













         * increase when the hardware manufacturer provides an OTA update.













         * The major and minor SDK version of the software currently running on













         * this hardware device. This value never changes while a device is













         * booted, but it may increase when the hardware manufacturer provides













         * an OTA update.













         * <p>













         * <code>SDK_INT</code> is increased on new Android dessert releases,













         * also called major releases. Between these, Android may also release













         * minor releases where <code>SDK_INT</code> remains unchanged. Minor













         * releases can add new APIs, and have stricter guarantees around













         * backwards compatibility (e.g. no changes gated by













         * <code>targetSdkVersion</code>) compared to major releases.













         * <p>













         * <code>SDK_INT_FULL</code> is increased on every release.















         * <p>













         * Together with {@link SDK_INT}, this constant defines the













         * <pre>major.minor</pre> version of Android. See {@link SDK_INT} for













         * more information.













         * Possible values are defined in {@link













         * android.os.Build.VERSION_CODES_FULL}.















         */















        @FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)













        public static final int SDK_MINOR_INT = SystemProperties.getInt(













                "ro.build.version.sdk_minor", 0);













        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);













        }































        /**















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










@@ -1263,6 +1273,25 @@ public class Build {













        public static final int VANILLA_ICE_CREAM = 35;















    }





























    /**













     * Enumeration of the currently known SDK major and minor version codes.













     * The numbers increase for every release, and are guaranteed to be ordered













     * by the release date of each release. The actual values should be













     * considered an implementation detail, and the current encoding scheme may













     * change in the future.













     *













     * @see android.os.Build.VERSION#SDK_INT_FULL













     */













    @FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)













    @SuppressLint("AcronymName")













    public static class VERSION_CODES_FULL {













        private VERSION_CODES_FULL() {}



























        // Use the last 5 digits for the minor version. This allows the













        // minor version to be set to CUR_DEVELOPMENT.













        private static final int SDK_INT_MULTIPLIER = 100000;













    }





























    /**















     * The vendor API for 2024 Q2















     *