Merge "Always log new user state to event log" into oc-dev

2017-06-16 19:51:00 +00:00
parent 6cde68752c a9a83f0d32
commit 6db4406fbd
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/UserState.java
+++ b/services/core/java/com/android/server/am/UserState.java
@@ -69,7 +69,6 @@ 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 "
@@ -84,6 +83,7 @@ public final class UserState {
        }
        Slog.i(TAG, "User " + mHandle.getIdentifier() + " state changed from "
                + stateToString(state) + " to " + stateToString(newState));
+        EventLogTags.writeAmUserStateChanged(mHandle.getIdentifier(), newState);
        lastState = state;
        state = newState;
    }