Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec14d78c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 1aa4f6fe: am 5691474c: am ad08e6dc: Merge "Emit event log message when... 

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

* commit '1aa4f6fe':
  Emit event log message when switching users.
parents bf58331a 1aa4f6fe

services/java/com/android/server/am/ActivityManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -14231,6 +14231,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    startHomeActivityLocked(userId);

                }













                EventLogTags.writeAmSwitchUser(userId);















                getUserManagerLocked().userForeground(userId);















                sendUserSwitchBroadcastsLocked(oldUserId, userId);















                if (needStart) {

























services/java/com/android/server/am/EventLogTags.logtags



+3
−0




























Original line number
Diff line number
Diff line








@@ -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)