Merge "Merge "Expose android.os.Build.VERSION.ACTIVE_CODENAMES to CTS" am: 644792c7d6 am: c2975a3850" into qt-dev-plus-aosp

2019-04-19 20:16:39 +00:00
parent cb506bf6c8 42df3187de
commit 456017a60e
2 changed files with 2 additions and 0 deletions
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1694,6 +1694,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;
  }
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -322,6 +322,7 @@ public class Build {
        /**
         * @hide
         */
+        @TestApi
        @UnsupportedAppUsage
        public static final String[] ACTIVE_CODENAMES = "REL".equals(ALL_CODENAMES[0])
                ? new String[0] : ALL_CODENAMES;