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

Merge "Emit event log message when switching users." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-11-09 17:23:21 -08:00
committed by Android (Google) Code Review
parent df2670f162 86597df79f
commit ad08e6dcfc
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -14229,6 +14229,7 @@ public final class ActivityManagerService extends ActivityManagerNative
startHomeActivityLocked(userId); startHomeActivityLocked(userId);
} }
EventLogTags.writeAmSwitchUser(userId);
getUserManagerLocked().userForeground(userId); getUserManagerLocked().userForeground(userId);
sendUserSwitchBroadcastsLocked(oldUserId, userId); sendUserSwitchBroadcastsLocked(oldUserId, userId);
if (needStart) { if (needStart) {

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

@ -83,3 +83,6 @@ option java_package com.android.server.am
30039 am_crash (User|1|5),(PID|1|5),(Process Name|3),(Flags|1|5),(Exception|3),(Message|3),(File|3),(Line|1|5) 30039 am_crash (User|1|5),(PID|1|5),(Process Name|3),(Flags|1|5),(Exception|3),(Message|3),(File|3),(Line|1|5)
# Log.wtf() called # Log.wtf() called
30040 am_wtf (User|1|5),(PID|1|5),(Process Name|3),(Flags|1|5),(Tag|3),(Message|3) 30040 am_wtf (User|1|5),(PID|1|5),(Process Name|3),(Flags|1|5),(Tag|3),(Message|3)
# User switched
30041 am_switch_user (id|1|5)