commit cac5c61e24d2ce62316c0c0f7426c3b35aba628e
author Dan Willemsen <dwillemsen@google.com> Thu Apr 18 13:38:57 2019 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu Apr 18 14:06:54 2019 -0700
tree 8159de4ca86bbfb4412269b17cf988ad0d74253b
parent 3876ca9d81fbeb07dbda8c7d9c2600cf31ad7952

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

So that CTS can handle more than one active codename.

Bug: 130764058
Test: atest CtsOsTestCases:android.os.cts.BuildTest#testBuildConstants
Change-Id: I671e28308723ee9e79ded01f12330e4efdbbbe17

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index dc5ff8f..cb9ff493 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -923,6 +923,7 @@
 package android.os {
 
   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 1c319fb..d3bed02 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -287,6 +287,7 @@
         /**
          * @hide
          */
+        @TestApi
         @UnsupportedAppUsage
         public static final String[] ACTIVE_CODENAMES = "REL".equals(ALL_CODENAMES[0])
                 ? new String[0] : ALL_CODENAMES;