diff options
| author | Ian Rogers <irogers@google.com> | 2013-04-23 15:13:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-23 15:13:05 +0000 |
| commit | be4536d214eedc3d12b50f0f30b47bba773b8dbc (patch) | |
| tree | afbd0e468dd2e7d5e31a10489ad0543cd8e7bc34 | |
| parent | abc2763e4587c3326d160f25666e933cc6888884 (diff) | |
| parent | c2a3adbd56e763ef0ad045fd8c58a54e41d1639d (diff) | |
| download | base-be4536d214eedc3d12b50f0f30b47bba773b8dbc.tar.gz | |
Merge "Adding matching @deprecated."
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Debug.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index e46dbeb74db0..7462415d0c9c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15916,7 +15916,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 2e77237451ce..fd01da9f8afa 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(); } |