From 282a7e1b1db121c910f25b13081242a8c7611708 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 19 Apr 2013 11:31:48 -0700 Subject: [PATCH] Adding matching @deprecated. Bug: 8657266 (Cherry-pick of c2a3adbd56e763ef0ad045fd8c58a54e41d1639d) Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c --- api/current.txt | 2 +- core/java/android/os/Debug.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index d71ab3563416b..4c54565b412dd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 2e77237451ce2..fd01da9f8afaf 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -577,6 +577,7 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo * * @see #startAllocCounting() */ + @Deprecated public static void stopAllocCounting() { VMDebug.stopAllocCounting(); }