From cac5c61e24d2ce62316c0c0f7426c3b35aba628e Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 18 Apr 2019 13:38:57 -0700
Subject: [PATCH] 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            | 1 +
 core/java/android/os/Build.java | 1 +
 2 files changed, 2 insertions(+)

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