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

Commit a4688278 authored Aug 11, 2017 by Fyodor Kupolov Committed by android-build-merger Aug 11, 2017

Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev

am: 0ee1e6d3

Change-Id: I8c22fb94b4e59426b8832a4bae5d2717090256d2

parents 0650482c 0ee1e6d3

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2012,7 +2012,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
	public boolean okToShowLocked() {		public boolean okToShowLocked() {
	return (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0		return (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0
	\|\| (mStackSupervisor.isCurrentProfileLocked(userId)		\|\| (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	Original line	Diff line number	Diff line
	@@ -1447,15 +1447,6 @@ final class UserController {
	return mStartedUserArray;		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) {		boolean isUserRunningLocked(int userId, int flags) {
	UserState state = getStartedUserStateLocked(userId);		UserState state = getStartedUserStateLocked(userId);
	if (state == null) {		if (state == null) {