Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Inline two constants from CorePlatform"

Browse Source
This commit is contained in:
Anton Hansson
2021-05-11 09:00:57 +00:00
committed by Gerrit Code Review
parent b369ebee31 4e86dcad12
commit dbf1544b68
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -484,7 +484,7 @@ stubs_defaults {
"android.hardware.usb.gadget-V1.0-java", "android.hardware.usb.gadget-V1.0-java",
"android.hardware.vibrator-V1.3-java", "android.hardware.vibrator-V1.3-java",
"framework-protos", "framework-protos",
"stable.core.platform.api.stubs", "art.module.public.api",
// There are a few classes from modules used by the core that // 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 // 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, // full sdk to ensure we can resolve them. If a new class gets added,

3
core/java/android/os/Build.java
View File

@@ -424,7 +424,8 @@ public class Build {
* Magic version number for a current development build, which has * Magic version number for a current development build, which has
* not yet turned into an official release. * 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! * October 2008: The original, first, version of Android. Yay!

3
core/java/android/os/Debug.java
View File

@@ -74,8 +74,9 @@ public final class Debug
* *
* @deprecated Accurate counting is a burden on the runtime and may be removed. * @deprecated Accurate counting is a burden on the runtime and may be removed.
*/ */
// This must match VMDebug.TRACE_COUNT_ALLOCS.
@Deprecated @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 * Flags for printLoadedClasses(). Default behavior is to only show