Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fyodor Kupolov
2017-06-16 19:51:00 +00:00
committed by Android (Google) Code Review
parent 6cde68752c a9a83f0d32
commit 6db4406fbd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/UserState.java
View File

@@ -69,7 +69,6 @@ public final class UserState {
public boolean setState(int oldState, int newState) { public boolean setState(int oldState, int newState) {
if (state == oldState) { if (state == oldState) {
setState(newState); setState(newState);
EventLogTags.writeAmUserStateChanged(mHandle.getIdentifier(), newState);
return true; return true;
} else { } else {
Slog.w(TAG, "Expected user " + mHandle.getIdentifier() + " in state " 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 " Slog.i(TAG, "User " + mHandle.getIdentifier() + " state changed from "
+ stateToString(state) + " to " + stateToString(newState)); + stateToString(state) + " to " + stateToString(newState));
EventLogTags.writeAmUserStateChanged(mHandle.getIdentifier(), newState);
lastState = state; lastState = state;
state = newState; state = newState;
} }