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

Commit 111041d6 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Always log new user state to event log" into oc-dev am: 6db4406f" into oc-dr1-dev

parents 04d2ec59 95f444cf

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

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

    }