diff options
| author | Anton Hansson <hansson@google.com> | 2021-05-11 10:48:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 10:48:12 +0000 |
| commit | 822d0ac2ba3cf42ebb4abb498707f5c3fdccf190 (patch) | |
| tree | 2bd568eed67b25111e00a634aca85ba9c419f6a3 | |
| parent | c8dffffc26bea7212e3ed3ebb50328231d17ba3d (diff) | |
| parent | 833e3741977dca87a4fe2b9706b65662c19d8fdf (diff) | |
Merge "Inline two constants from CorePlatform" am: dbf1544b68 am: e3eefd6d2e am: 833e374197
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727
Change-Id: Ibac0caf69f17c8f003a4a197654c176448a9b7b9
| -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 d75239afab45..4857f1b5d1ed 100644 --- a/Android.bp +++ b/Android.bp @@ -535,7 +535,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 fbf0f70a717f..38ed3fb4c8f4 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -437,7 +437,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 b8bb353a1c2f..d90e129d36f7 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 |