aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-11-16 18:03:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-16 18:03:53 -0800
commite929fbae102c8786eda98bf0e37146ff61fbf8d1 (patch)
tree2d2a26b901bddb0fc561724e6e64c81556bc5024
parent9fb61f39f3e34aac592aed22083ec0e67693a724 (diff)
parentbace01078259614f54c5082fae9ccdb37f27590c (diff)
downloadsystem_core-e929fbae102c8786eda98bf0e37146ff61fbf8d1.tar.gz
system_core-e929fbae102c8786eda98bf0e37146ff61fbf8d1.tar.bz2
system_core-e929fbae102c8786eda98bf0e37146ff61fbf8d1.zip
am bace0107: Work on issue #2259506: camera ANRed and then device runtime restarted
Merge commit 'bace01078259614f54c5082fae9ccdb37f27590c' into eclair-plus-aosp * commit 'bace01078259614f54c5082fae9ccdb37f27590c': Work on issue #2259506: camera ANRed and then device runtime restarted
-rw-r--r--logcat/event-log-tags2
1 files changed, 2 insertions, 0 deletions
diff --git a/logcat/event-log-tags b/logcat/event-log-tags
index 2140b374..1262f447 100644
--- a/logcat/event-log-tags
+++ b/logcat/event-log-tags
@@ -282,6 +282,8 @@
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)
+# The activity manager gave up on a new process taking too long to start
+30037 am_process_start_timeout (PID|1|5),(UID|1|5),(Process Name|3)
# Out of memory for surfaces.
31000 wm_no_surface_memory (Window|3),(PID|1|5),(Operation|3)