diff options
| author | 2019-04-19 19:30:50 +0000 | |
|---|---|---|
| committer | 2019-04-19 19:30:50 +0000 | |
| commit | 644792c7d652c65eb9f6bbb378215f6910be48f4 (patch) | |
| tree | 197ece75b59ed7a3999df63e54544cf36e4be36a | |
| parent | dc4d14b37a93ed9067dde0b9085d7f48847bfad6 (diff) | |
| parent | cac5c61e24d2ce62316c0c0f7426c3b35aba628e (diff) | |
Merge "Expose android.os.Build.VERSION.ACTIVE_CODENAMES to CTS"
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 1 |
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; |