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

Commit 9b96d060 authored by Kevin Lau Fang's avatar Kevin Lau Fang Committed by Android (Google) Code Review
Browse files

Merge "Revert submission"

parents 59a9fc1a 01e16a52

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+1 −1
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
        e.writeString(Build.BRAND);

        e.writeString(Build.PRODUCT);

        e.writeString(Build.DEVICE);

        e.writeString(Build.VERSION.RELEASE_OR_CODENAME);

        e.writeString(Build.VERSION.RELEASE);

        e.writeString(Build.ID);

        e.writeString(Build.VERSION.INCREMENTAL);

        e.writeString(Build.TYPE);

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -34393,7 +34393,6 @@ 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

+0 −7
Original line number Diff line number Diff line
@@ -239,13 +239,6 @@ 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
@@ -277,7 +277,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_OR_CODENAME; // "1.0" or "3.4b5"

        String version = Build.VERSION.RELEASE; // "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_OR_CODENAME);

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

        assertNotEmpty("TYPE", Build.TYPE);

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

        assertNotEmpty("FINGERPRINT", Build.FINGERPRINT);