Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev am: fee443bfab

am: 9d81c54bc8 Change-Id: Iff5a6cb3e48402cf56e1641db4e8fd15d6de7ffb
2018-03-27 02:37:11 +00:00
parent a3feba65ad 9d81c54bc8
commit 78232ee54b
3 changed files with 3 additions and 1 deletions
--- a/api/current.txt
+++ b/api/current.txt
@@ -32056,7 +32056,6 @@ package android.os {
    ctor public Build.VERSION();
    field public static final java.lang.String BASE_OS;
    field public static final java.lang.String CODENAME;
-    field public static final int FIRST_SDK_INT;
    field public static final java.lang.String INCREMENTAL;
    field public static final int MIN_SUPPORTED_TARGET_SDK_INT;
    field public static final int PREVIEW_SDK_INT;
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -482,6 +482,7 @@ package android.net {
 package android.os {

  public static class Build.VERSION {
+    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
@@ -242,7 +242,9 @@ public class Build {
         * Possible values are defined in {@link Build.VERSION_CODES}.
         *
         * @see #SDK_INT
+         * @hide
         */
+        @TestApi
        public static final int FIRST_SDK_INT = SystemProperties
                .getInt("ro.product.first_api_level", 0);