diff options
| author | Anton Hansson <hansson@google.com> | 2021-05-11 09:00:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-05-11 09:00:57 +0000 |
| commit | dbf1544b681f2f8587322b61b5d2387f05181292 (patch) | |
| tree | 2e6d3284c9ce29c08beb33926c0194671ec70cb6 | |
| parent | b369ebee31b3c380828d100d252f5b19daa790d9 (diff) | |
| parent | 4e86dcad1206e7246cef805d6251c8e4ead7a4b7 (diff) | |
Merge "Inline two constants from CorePlatform"
| -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 c916f5d4eb79..c632ff608d13 100644 --- a/Android.bp +++ b/Android.bp @@ -484,7 +484,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 966291b0891c..5017d9e8d905 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 |