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

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

Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev am: 0ee1e6d3 

am: a4688278

Change-Id: If40c52095c8aedcf87abdeae553d3eda46bbf396
parents 3b59301e a4688278

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

+1 −1
Original line number Diff line number Diff line
@@ -2012,7 +2012,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
    public boolean okToShowLocked() {

        return (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0

                || (mStackSupervisor.isCurrentProfileLocked(userId)

                && !service.mUserController.isUserStoppingOrShuttingDownLocked(userId));

                && service.mUserController.isUserRunningLocked(userId, 0 /* flags */));

    }



    /**

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

+0 −9
Original line number Diff line number Diff line
@@ -1445,15 +1445,6 @@ class UserController { 
        return mStartedUserArray;

    }



    boolean isUserStoppingOrShuttingDownLocked(int userId) {

        UserState state = getStartedUserStateLocked(userId);

        if (state == null) {

            return false;

        }

        return state.state == UserState.STATE_STOPPING

                || state.state == UserState.STATE_SHUTDOWN;

    }



    boolean isUserRunningLocked(int userId, int flags) {

        UserState state = getStartedUserStateLocked(userId);

        if (state == null) {