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

2012-11-09 17:23:21 -08:00
parent df2670f162 86597df79f
commit ad08e6dcfc
2 changed files with 4 additions and 0 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@ -14229,6 +14229,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                    startHomeActivityLocked(userId);
                }

+                EventLogTags.writeAmSwitchUser(userId);
                getUserManagerLocked().userForeground(userId);
                sendUserSwitchBroadcastsLocked(oldUserId, userId);
                if (needStart) {
--- a/services/java/com/android/server/am/EventLogTags.logtags
+++ b/services/java/com/android/server/am/EventLogTags.logtags
@ -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)