commit 42df3187de51e67fbe8db1f16fa9dd0880213862
author Dan Willemsen <dwillemsen@google.com> Fri Apr 19 13:12:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 19 13:12:10 2019 -0700
tree 3eed5ba48c4e3aa30a0156d417e73b17bdca4f87
parent b6ced95a95c358adee147d4bfe21a0236a065e42
parent c2975a38507f8ee82e3fec1dba40ac7c5b9b4ba2

Merge "Expose android.os.Build.VERSION.ACTIVE_CODENAMES to CTS" am: 644792c7d6
am: c2975a3850

Change-Id: I2c58d6c84d01d6f62ac081bd840386d27394cb39

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 9760cce..fc5f053 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1694,6 +1694,7 @@
   }
 
   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 RESOURCES_SDK_INT;
   }

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 94c8b91..b437083 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -322,6 +322,7 @@
         /**
          * @hide
          */
+        @TestApi
         @UnsupportedAppUsage
         public static final String[] ACTIVE_CODENAMES = "REL".equals(ALL_CODENAMES[0])
                 ? new String[0] : ALL_CODENAMES;