summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2009-10-13 12:04:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-13 12:04:49 -0700
commit945ff2024357bd4367cb437d3ebb32d6fb7e9438 (patch)
tree653ef7121e91eb96ad983781ef91e58dc47f173f /cmds
parent74ae80b623d72d7fab1999fb9ce4b759419f4553 (diff)
parent94f3a36326ddecaa09787d795451b0a229fe111c (diff)
downloadframeworks_base-945ff2024357bd4367cb437d3ebb32d6fb7e9438.zip
frameworks_base-945ff2024357bd4367cb437d3ebb32d6fb7e9438.tar.gz
frameworks_base-945ff2024357bd4367cb437d3ebb32d6fb7e9438.tar.bz2
am 94f3a363: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c' * commit '94f3a36326ddecaa09787d795451b0a229fe111c': Remove STOPSHIP BT logging. BT API security audit: fix a couple of permission mistakes. Fix issue #2175693: Add vmallocinfo to dumpstate add a way to easily catch and log GL errors (compile time flag) GPS: Fix problem with SUPL when SUPL APN is already active. Import revised translations. DO NOT MERGE Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device. Import revised translations. DO NOT MERGE
Diffstat (limited to 'cmds')
-rw-r--r--cmds/dumpstate/dumpstate.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 9c2becf..ca8660c 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -56,6 +56,8 @@ static void dumpstate(int full) {
EXEC_XBIN("procrank");
PRINT("------ VIRTUAL MEMORY STATS ------");
DUMP("/proc/vmstat");
+ PRINT("------ VMALLOC INFO ------");
+ DUMP("/proc/vmallocinfo");
PRINT("------ SLAB INFO ------");
DUMP("/proc/slabinfo");
PRINT("------ ZONEINFO ------");