am 5691474c: am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev

* commit '5691474c9cbaeb37eeb659a3adbc05d31d668611':
  Emit event log message when switching users.
This commit is contained in:
Jeff Sharkey
2012-11-09 22:45:33 -08:00
committed by Android Git Automerger
2 changed files with 4 additions and 0 deletions

View File

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

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)
# Log.wtf() called
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)