drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-11-15 11:44:12 -08:00
committed by Android (Google) Code Review
parent 1f4c9d3e90 9d6d890e0d
commit f6ba84b424
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/am/ActiveServices.java
View File

@ -1090,11 +1090,8 @@ public class ActiveServices {
boolean created = false; boolean created = false;
try { try {
mAm.mStringBuilder.setLength(0); EventLogTags.writeAmCreateService(
r.intent.getIntent().toShortString(mAm.mStringBuilder, true, false, true, false); r.userId, System.identityHashCode(r), r.shortName, r.app.pid);
EventLog.writeEvent(EventLogTags.AM_CREATE_SERVICE,
r.userId, System.identityHashCode(r), r.shortName,
mAm.mStringBuilder.toString(), r.app.pid);
synchronized (r.stats.getBatteryStats()) { synchronized (r.stats.getBatteryStats()) {
r.stats.startLaunchedLocked(); r.stats.startLaunchedLocked();
} }
@ -1242,9 +1239,8 @@ public class ActiveServices {
} }
if (DEBUG_SERVICE) Slog.v(TAG, "Bringing down " + r + " " + r.intent); if (DEBUG_SERVICE) Slog.v(TAG, "Bringing down " + r + " " + r.intent);
EventLog.writeEvent(EventLogTags.AM_DESTROY_SERVICE, EventLogTags.writeAmDestroyService(
r.userId, System.identityHashCode(r), r.shortName, r.userId, System.identityHashCode(r), (r.app != null) ? r.app.pid : -1);
(r.app != null) ? r.app.pid : -1);
mServiceMap.removeServiceByName(r.name, r.userId); mServiceMap.removeServiceByName(r.name, r.userId);
mServiceMap.removeServiceByIntent(r.intent, r.userId); mServiceMap.removeServiceByIntent(r.intent, r.userId);

4
services/java/com/android/server/am/EventLogTags.logtags
View File

@ -63,9 +63,9 @@ option java_package com.android.server.am
30024 am_broadcast_discard_filter (User|1|5),(Broadcast|1|5),(Action|3),(Receiver Number|1|1),(BroadcastFilter|1|5) 30024 am_broadcast_discard_filter (User|1|5),(Broadcast|1|5),(Action|3),(Receiver Number|1|1),(BroadcastFilter|1|5)
30025 am_broadcast_discard_app (User|1|5),(Broadcast|1|5),(Action|3),(Receiver Number|1|1),(App|3) 30025 am_broadcast_discard_app (User|1|5),(Broadcast|1|5),(Action|3),(Receiver Number|1|1),(App|3)
# A service is being created # A service is being created
30030 am_create_service (User|1|5),(Service Record|1|5),(Name|3),(Intent|3),(PID|1|5) 30030 am_create_service (User|1|5),(Service Record|1|5),(Name|3),(PID|1|5)
# A service is being destroyed # A service is being destroyed
30031 am_destroy_service (User|1|5),(Service Record|1|5),(Name|3),(PID|1|5) 30031 am_destroy_service (User|1|5),(Service Record|1|5),(PID|1|5)
# A process has crashed too many times, it is being cleared # A process has crashed too many times, it is being cleared
30032 am_process_crashed_too_much (User|1|5),(Name|3),(PID|1|5) 30032 am_process_crashed_too_much (User|1|5),(Name|3),(PID|1|5)
# An unknown process is trying to attach to the activity manager # An unknown process is trying to attach to the activity manager