aboutsummaryrefslogtreecommitdiffstats
path: root/logcat
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-13 12:57:54 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-13 12:57:54 -0800
commit1b8e5a6b14ca850920e19b3dfae41e6494475c1a (patch)
tree67bdeb039019f8a47d5cd607c18d99a7c8eb3141 /logcat
parent13f797da7f190e9ea52f2f3d235210b8a4963b21 (diff)
downloadsystem_core-1b8e5a6b14ca850920e19b3dfae41e6494475c1a.tar.gz
system_core-1b8e5a6b14ca850920e19b3dfae41e6494475c1a.tar.bz2
system_core-1b8e5a6b14ca850920e19b3dfae41e6494475c1a.zip
auto import from //branches/cupcake/...@131421
Diffstat (limited to 'logcat')
-rw-r--r--logcat/event-log-tags13
-rw-r--r--logcat/logcat.cpp3
2 files changed, 14 insertions, 2 deletions
diff --git a/logcat/event-log-tags b/logcat/event-log-tags
index 4f170408..fb42bfee 100644
--- a/logcat/event-log-tags
+++ b/logcat/event-log-tags
@@ -191,10 +191,23 @@
30030 am_create_service (Service Record|1|5),(Name|3),(Intent|3),(PID|1|5)
# A service is being destroyed
30031 am_destroy_service (Service Record|1|5),(Name|3),(PID|1|5)
+# A process has crashed too many times, it is being cleared
+30032 am_process_crashed_too_much (Name|3),(PID|1|5)
+# An unknown process is trying to attach to the activity manager
+30033 am_drop_process (PID|1|5)
+# A service has crashed too many times, it is being stopped
+30034 am_service_crashed_too_much (Crash Count|1|1),(Component Name|3),(PID|1|5)
+# A service is going to be restarted after its process went away
+30035 am_schedule_service_restart (Component Name|3),(Time|2|3)
+# A client was waiting for a content provider, but its process was lost
+30036 am_provider_lost_process (Package Name|3),(UID|1|5),(Name|3)
# Out of memory for surfaces.
31000 wm_no_surface_memory (Window|3),(PID|1|5),(Operation|3)
+# Re-connecting to input method service because we haven't received its interface
+32000 imf_force_reconnect_ime (IME|4),(Time Since Connect|2|3),(Showing|1|1)
+
# dvm_gc_info: LIST (LONG, LONG, LONG)
#
# First LONG:
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index d9ca131b..3130a1cc 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -1,7 +1,6 @@
// Copyright 2006 The Android Open Source Project
-#include <utils/misc.h>
-#include <utils/logger.h>
+#include <cutils/logger.h>
#include <cutils/logd.h>
#include <cutils/sockets.h>
#include <cutils/logprint.h>