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

Commit 95f444cf authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

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

am: 6db4406f

Change-Id: I5ed5aacfb054a7c7fef91b0ac51cc89541983818
parents 963a2077 6db4406f

services/core/java/com/android/server/am/UserState.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }