diff options
| author | Anton Hansson <hansson@google.com> | 2021-05-11 10:29:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 10:29:15 +0000 |
| commit | 833e3741977dca87a4fe2b9706b65662c19d8fdf (patch) | |
| tree | 5aba6ebda28b47b775402fa8346c8c81b4f1b35a /core/java | |
| parent | 04b9df477aae753a91fecb6c356e301d8de256b4 (diff) | |
| parent | e3eefd6d2e83fab50dd41fae19d4fca783d6f1a3 (diff) | |
Merge "Inline two constants from CorePlatform" am: dbf1544b68 am: e3eefd6d2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727
Change-Id: Ifa3f8535c1135b5b67fc1fc9cb4f0377be3acd86
Diffstat (limited to 'core/java')
| -rwxr-xr-x | core/java/android/os/Build.java | 3 | ||||
| -rw-r--r-- | core/java/android/os/Debug.java | 3 |
2 files changed, 4 insertions, 2 deletions
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 |