summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-04-07 15:11:57 -0700
committerDianne Hackborn <hackbod@google.com>2011-05-13 18:38:19 -0700
commit9a84983a9fd9959671e102045eaf185b83291269 (patch)
tree7235da3c8ad520b16425fee7984cbcd0cacf9b0b /api
parentf9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f (diff)
downloadframeworks_base-9a84983a9fd9959671e102045eaf185b83291269.zip
frameworks_base-9a84983a9fd9959671e102045eaf185b83291269.tar.gz
frameworks_base-9a84983a9fd9959671e102045eaf185b83291269.tar.bz2
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Activity manager now does all dump requests into apps asynchronously, so it can nicely timeout if there is an app problem. Also lots of general cleanup of the am dump output. Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
Diffstat (limited to 'api')
-rw-r--r--api/current.xml47
1 files changed, 47 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index b85ace5..ba4fa7b 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -143329,6 +143329,21 @@
<parameter name="args" type="java.lang.String[]">
</parameter>
</method>
+<method name="dumpAsync"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="fd" type="java.io.FileDescriptor">
+</parameter>
+<parameter name="args" type="java.lang.String[]">
+</parameter>
+</method>
<method name="flushPendingCommands"
return="void"
abstract="false"
@@ -147801,6 +147816,23 @@
<exception name="RemoteException" type="android.os.RemoteException">
</exception>
</method>
+<method name="dumpAsync"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="fd" type="java.io.FileDescriptor">
+</parameter>
+<parameter name="args" type="java.lang.String[]">
+</parameter>
+<exception name="RemoteException" type="android.os.RemoteException">
+</exception>
+</method>
<method name="getInterfaceDescriptor"
return="java.lang.String"
abstract="true"
@@ -150155,6 +150187,21 @@
visibility="public"
>
</method>
+<method name="dup"
+ return="android.os.ParcelFileDescriptor"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="orig" type="java.io.FileDescriptor">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+</method>
<method name="fromSocket"
return="android.os.ParcelFileDescriptor"
abstract="false"