diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-11-09 22:45:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-09 22:45:33 -0800 |
| commit | 1aa4f6fe7e150fb60c5f28a9c4dd8ad6fb06984a (patch) | |
| tree | 8bfa276f81f28f4e9b39f0d9636f4455d5444535 /services/java | |
| parent | 8baf63d5bae9a96d34b29f3c75d51bf079642352 (diff) | |
| parent | 5691474c9cbaeb37eeb659a3adbc05d31d668611 (diff) | |
| download | frameworks_base-1aa4f6fe7e150fb60c5f28a9c4dd8ad6fb06984a.zip frameworks_base-1aa4f6fe7e150fb60c5f28a9c4dd8ad6fb06984a.tar.gz frameworks_base-1aa4f6fe7e150fb60c5f28a9c4dd8ad6fb06984a.tar.bz2 | |
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.
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/am/EventLogTags.logtags | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index d2cd646..db64a9a 100644 --- 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) { diff --git a/services/java/com/android/server/am/EventLogTags.logtags b/services/java/com/android/server/am/EventLogTags.logtags index 6ee7507..88c0c03 100644 --- 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) |