Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41fabddc authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Inline two constants from CorePlatform" am: dbf1544b am: e3eefd6d... 

Merge "Inline two constants from CorePlatform" am: dbf1544b am: e3eefd6d am: 833e3741 am: 822d0ac2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727

Change-Id: I75b79f7dfb597f8a91e0ac5a852b0689a4c5171d
parents 59387d8d 822d0ac2

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/java/android/os/Build.java

+2 −1
Original line number Diff line number Diff line
@@ -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!

core/java/android/os/Debug.java

+2 −1
Original line number Diff line number Diff line
@@ -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