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

Commit 4c7fba28 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b926 am: e3086a98 am: ffa0f389 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: I21f5874867e74ca12334711adf1fbc6938c1a3ff
parents cdda8325 ffa0f389

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30867,6 +30867,7 @@ package android.os { 
    field public static final int PREVIEW_SDK_INT;

    field public static final String RELEASE;

    field @NonNull public static final String RELEASE_OR_CODENAME;

    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 public static final String SECURITY_PATCH;

core/java/android/os/Build.java

+9 −2
Original line number Diff line number Diff line
@@ -285,12 +285,19 @@ public class Build { 
        public static final String RELEASE = getString("ro.build.version.release");



        /**

         * The version string we show to the user; may be {@link #RELEASE} or

         * {@link #CODENAME} if not a final release build.

         * The version string.  May be {@link #RELEASE} or {@link #CODENAME} if

         * not a final release build.

         */

        @NonNull public static final String RELEASE_OR_CODENAME = getString(

                "ro.build.version.release_or_codename");



        /**

         * The version string we show to the user; may be {@link #RELEASE} or

         * a descriptive string if not a final release build.

         */

        @NonNull public static final String RELEASE_OR_PREVIEW_DISPLAY = getString(

                "ro.build.version.release_or_preview_display");



        /**

         * The base OS build the product is based on.

         */