diff options
| author | Anton Hansson <hansson@google.com> | 2021-05-07 16:32:10 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2021-05-10 10:28:02 +0100 |
| commit | 4e86dcad1206e7246cef805d6251c8e4ead7a4b7 (patch) | |
| tree | 2c6803fcd2b16917c63156ad52c361eed666ccf9 | |
| parent | c7f5e7d4397050430aef255b876e9c15a91ddb70 (diff) | |
Inline two constants from CorePlatform
Inlining these constants allow the public api metalava run to depend on
ART's public API rather than the "internal" CorePlatform API, which
prevents picking up unintentional classes (such as annotations) from the
CorePlatform API in the public stubs.
Because these constants get inlined in the API/stubs, and the constants
have been finalized for many years, they can never change. Because they
cannot change, reusing the constant is of limited value. I've added
some comments to point readers to other places the constant is used.
Bug: 154796679
Test: m checkapi
Change-Id: I0b347a2964cfe5a1206145fdc56934727b890469
| -rw-r--r-- | Android.bp | 2 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 3 | ||||
| -rw-r--r-- | core/java/android/os/Debug.java | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 2ee97b0de816..183c1e5c3d32 100644 --- a/Android.bp +++ b/Android.bp @@ -522,7 +522,7 @@ stubs_defaults { "android.hardware.usb.gadget-V1.0-java", "android.hardware.vibrator-V1.3-java", "framework-protos", - "stable.core.platform.api.stubs", + "art.module.public.api", // There are a few classes from modules used by the core that // need to be resolved by metalava. We use a prebuilt stub of the // full sdk to ensure we can resolve them. If a new class gets added, diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index e47ffcc4ff4c..6a866bb08e1f 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -424,7 +424,8 @@ public class Build { * Magic version number for a current development build, which has * not yet turned into an official release. */ - public static final int CUR_DEVELOPMENT = VMRuntime.SDK_VERSION_CUR_DEVELOPMENT; + // This must match VMRuntime.SDK_VERSION_CUR_DEVELOPMENT. + public static final int CUR_DEVELOPMENT = 10000; /** * October 2008: The original, first, version of Android. Yay! diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 1e60f74dd3d3..a7516a428ff0 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -74,8 +74,9 @@ public final class Debug * * @deprecated Accurate counting is a burden on the runtime and may be removed. */ + // This must match VMDebug.TRACE_COUNT_ALLOCS. @Deprecated - public static final int TRACE_COUNT_ALLOCS = VMDebug.TRACE_COUNT_ALLOCS; + public static final int TRACE_COUNT_ALLOCS = 1; /** * Flags for printLoadedClasses(). Default behavior is to only show |