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

Commit c2975a38 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Expose android.os.Build.VERSION.ACTIVE_CODENAMES to CTS" 

am: 644792c7

Change-Id: I659115cec0db8ccae778e1b842a08bb04c63e10f
parents 386d538f 644792c7

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -923,6 +923,7 @@ package android.net.util { 
package android.os {

package android.os {





  public static class Build.VERSION {

  public static class Build.VERSION {

    field public static final String[] ACTIVE_CODENAMES;

    field public static final int FIRST_SDK_INT;

    field public static final int FIRST_SDK_INT;

    field public static final int RESOURCES_SDK_INT;

    field public static final int RESOURCES_SDK_INT;

  }

  }

core/java/android/os/Build.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -287,6 +287,7 @@ public class Build { 
        /**

        /**

         * @hide

         * @hide

         */

         */

        @TestApi

        @UnsupportedAppUsage

        @UnsupportedAppUsage

        public static final String[] ACTIVE_CODENAMES = "REL".equals(ALL_CODENAMES[0])

        public static final String[] ACTIVE_CODENAMES = "REL".equals(ALL_CODENAMES[0])

                ? new String[0] : ALL_CODENAMES;

                ? new String[0] : ALL_CODENAMES;