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

Commit db007454 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Narayan Kamath
Browse files

Reland: Rework platform version to hide codenames. 

The public platform version no longer can be a codename, it is
always the most recently released platform.  A new build property
and API provides either the offical version or the current codename
as appropriate.  This will avoid breaking apps that look at the
platform version while development is under a codename.

Bug:  143175463
Test: manual
Exempt-From-Owner-Approval: Relanding change with zero delta in this project.
Change-Id: I4407df40151d884293fa9d301a401b65bedb5527
parent 4987e9d2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35671,6 +35671,7 @@ package android.os { 
    field public static final String INCREMENTAL;

    field public static final int PREVIEW_SDK_INT;

    field public static final String RELEASE;

    field @NonNull public static final String RELEASE_OR_CODENAME;

    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

+7 −0
Original line number Diff line number Diff line
@@ -239,6 +239,13 @@ 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.

         */

        @NonNull public static final String RELEASE_OR_CODENAME = getString(

                "ro.build.version.release_or_codename");



        /**

         * The base OS build the product is based on.

         */

core/java/com/android/internal/os/RuntimeInit.java

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ public class RuntimeInit { 
        result.append(System.getProperty("java.vm.version")); // such as 1.1.0

        result.append(" (Linux; U; Android ");



        String version = Build.VERSION.RELEASE; // "1.0" or "3.4b5"

        String version = Build.VERSION.RELEASE_OR_CODENAME; // "1.0" or "3.4b5"

        result.append(version.length() > 0 ? version : "1.0");



        // add the model for the release build

core/tests/coretests/src/android/os/BuildTest.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class BuildTest extends TestCase { 
        assertNotEmpty("BRAND", Build.BRAND);

        assertNotEmpty("MODEL", Build.MODEL);

        assertNotEmpty("VERSION.INCREMENTAL", Build.VERSION.INCREMENTAL);

        assertNotEmpty("VERSION.RELEASE", Build.VERSION.RELEASE);

        assertNotEmpty("VERSION.RELEASE", Build.VERSION.RELEASE_OR_CODENAME);

        assertNotEmpty("TYPE", Build.TYPE);

        Assert.assertNotNull("TAGS", Build.TAGS); // TAGS is allowed to be empty.

        assertNotEmpty("FINGERPRINT", Build.FINGERPRINT);

packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            v.setText(mContext.getString(

                    com.android.internal.R.string.bugreport_status,

                    Build.VERSION.RELEASE,

                    Build.VERSION.RELEASE_OR_CODENAME,

                    Build.ID));

            v.setVisibility(View.VISIBLE);

        } else {