summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2013-02-22 19:59:23 -0800
committerIan Rogers <irogers@google.com>2013-02-26 13:30:08 -0800
commitfe067a4cc586631881f51d0fd48100dd0f7cadf2 (patch)
tree34778e24f05273b7cf9cfc44269c96a9cdb0e186 /api/current.txt
parent08a92a335fd84ca427b55c6c2d39f72970d82b76 (diff)
downloadframeworks_base-fe067a4cc586631881f51d0fd48100dd0f7cadf2.zip
frameworks_base-fe067a4cc586631881f51d0fd48100dd0f7cadf2.tar.gz
frameworks_base-fe067a4cc586631881f51d0fd48100dd0f7cadf2.tar.bz2
Deprecate and document memory allocation counting.
Bug: 8241521 Change-Id: I174c4024600c5b78e74030ecc99e784a98295f09
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index d281f13..269af6b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15910,7 +15910,7 @@ package android.os {
method public static void resetThreadGcInvocationCount();
method public static deprecated int setAllocationLimit(int);
method public static deprecated int setGlobalAllocationLimit(int);
- method public static void startAllocCounting();
+ method public static deprecated void startAllocCounting();
method public static void startMethodTracing();
method public static void startMethodTracing(java.lang.String);
method public static void startMethodTracing(java.lang.String, int);
@@ -41332,8 +41332,8 @@ package java.util.zip {
public class ZipFile {
ctor public ZipFile(java.io.File) throws java.io.IOException, java.util.zip.ZipException;
- ctor public ZipFile(java.io.File, int) throws java.io.IOException;
ctor public ZipFile(java.lang.String) throws java.io.IOException;
+ ctor public ZipFile(java.io.File, int) throws java.io.IOException;
method public void close() throws java.io.IOException;
method public java.util.Enumeration<? extends java.util.zip.ZipEntry> entries();
method public java.util.zip.ZipEntry getEntry(java.lang.String);