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

Commit 896ee5b6 authored by Ian Rogers's avatar Ian Rogers Committed by Android Git Automerger
Browse files

am be4536d2: Merge "Adding matching @deprecated." 

* commit 'be4536d2':
  Adding matching @deprecated.
parents 393abb1c be4536d2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16949,7 +16949,7 @@ package android.os { 
    method public static void startMethodTracing(java.lang.String, int);

    method public static void startMethodTracing(java.lang.String, int, int);

    method public static void startNativeTracing();

    method public static void stopAllocCounting();

    method public static deprecated void stopAllocCounting();

    method public static void stopMethodTracing();

    method public static void stopNativeTracing();

    method public static long threadCpuTimeNanos();

core/java/android/os/Debug.java

+1 −0
Original line number Diff line number Diff line
@@ -577,6 +577,7 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo 
     *

     * @see #startAllocCounting()

     */

    @Deprecated

    public static void stopAllocCounting() {

        VMDebug.stopAllocCounting();

    }