From 1da8bb1d8e538cd7c248d9478fb511cd4ff8e343 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 26 Mar 2018 12:50:54 -0600 Subject: [PATCH] Move FIRST_SDK_INT to @TestApi. Test: atest android.os.cts.BuildTest Bug: 71555186 Change-Id: I92732b930834d9c1e4150417bb3ee8b6839e2b3e --- api/current.txt | 1 - api/test-current.txt | 1 + core/java/android/os/Build.java | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 5e7fa591385e..b75c44190408 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32057,7 +32057,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; diff --git a/api/test-current.txt b/api/test-current.txt index e84d204919f0..11e19eac8817 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -481,6 +481,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; } diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index df6ce8e85601..e22c65fee4cf 100644 --- 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); -- 2.11.0