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

Commit f5cf319d authored by Nicolas Prevot's avatar Nicolas Prevot Committed by android-build-merger
Browse files

Merge \"Don\'t allow showing an activity if user is stopping or shutting down.\" into nyc-dev 

am: 2058553b

Change-Id: Ie6995527fb31b9b5f0c272726c80754927770c55
parents 30ec4f27 2058553b

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

+3 −2
Original line number Diff line number Diff line
@@ -3029,8 +3029,9 @@ public final class ActivityStackSupervisor implements DisplayListener { 


    /** Checks whether the activity should be shown for current user. */

    boolean okToShowLocked(ActivityRecord r) {

        return r != null && (isCurrentProfileLocked(r.userId)

                || (r.info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0);

        return r != null && ((r.info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0

                || (isCurrentProfileLocked(r.userId)

                && !mService.mUserController.isUserStoppingOrShuttingDownLocked(r.userId)));

    }



    final ArrayList<ActivityRecord> processStoppingActivitiesLocked(boolean remove) {

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

+9 −0
Original line number Diff line number Diff line
@@ -1336,6 +1336,15 @@ final 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) {

services/core/java/com/android/server/pm/UserManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -737,9 +737,9 @@ public class UserManagerService extends IUserManager.Stub { 
            long identity = Binder.clearCallingIdentity();

            try {

                if (enableQuietMode) {

                    ActivityManagerNative.getDefault().stopUser(userHandle, /* force */true, null);

                    LocalServices.getService(ActivityManagerInternal.class)

                            .killForegroundAppsForUser(userHandle);

                    ActivityManagerNative.getDefault().stopUser(userHandle, /* force */true, null);

                } else {

                    ActivityManagerNative.getDefault().startUserInBackground(userHandle);

                }