summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-11-10 00:02:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-11-10 00:02:14 +0000
commit4bd26bef66a5f37d77b80a5076f5a10fde58d4e3 (patch)
tree8db0ed3190ea4ec61df4a4e9b72343b939279773
parenta3fa81358f2134fb18ac24f97ed455b77af0ba04 (diff)
parent97c6d3d492ce085239b8c8bd6d752cbd05a69f35 (diff)
Merge "Add event logging for UserState transitions."
-rw-r--r--services/core/java/com/android/server/am/EventLogTags.logtags2
-rw-r--r--services/core/java/com/android/server/am/UserState.java1
2 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags
index 722974b62f59..f618fc7c2a29 100644
--- a/services/core/java/com/android/server/am/EventLogTags.logtags
+++ b/services/core/java/com/android/server/am/EventLogTags.logtags
@@ -112,3 +112,5 @@ option java_package com.android.server.am
# Report changing memory conditions (Values are ProcessStats.ADJ_MEM_FACTOR* constants)
30050 am_mem_factor (Current|1|5),(Previous|1|5)
+# UserState has changed
+30051 am_user_state_changed (id|1|5),(state|1|5)
diff --git a/services/core/java/com/android/server/am/UserState.java b/services/core/java/com/android/server/am/UserState.java
index 48238b6f4cf3..42c31b1a6de4 100644
--- a/services/core/java/com/android/server/am/UserState.java
+++ b/services/core/java/com/android/server/am/UserState.java
@@ -70,6 +70,7 @@ public final class UserState {
public boolean setState(int oldState, int newState) {
if (state == oldState) {
setState(newState);
+ EventLogTags.writeAmUserStateChanged(mHandle.getIdentifier(), newState);
return true;
} else {
Slog.w(TAG, "Expected user " + mHandle.getIdentifier() + " in state "