summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Willemsen <dwillemsen@google.com> 2019-04-18 13:38:57 -0700
committer Dan Willemsen <dwillemsen@google.com> 2019-04-18 14:06:54 -0700
commitcac5c61e24d2ce62316c0c0f7426c3b35aba628e (patch)
tree8159de4ca86bbfb4412269b17cf988ad0d74253b
parent3876ca9d81fbeb07dbda8c7d9c2600cf31ad7952 (diff)
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
-rw-r--r--api/test-current.txt1
-rwxr-xr-xcore/java/android/os/Build.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index dc5ff8f229c2..cb9ff493c546 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 1c319fb4ea36..d3bed02a4b47 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;