Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev

Browse Source 
am: 0ee1e6d3c1

Change-Id: I8c22fb94b4e59426b8832a4bae5d2717090256d2
This commit is contained in:
Fyodor Kupolov
2017-08-11 01:38:24 +00:00
committed by android-build-merger
parent 0650482c2d 0ee1e6d3c1
commit a468827851
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -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 */));
}
/**

9
services/core/java/com/android/server/am/UserController.java
View File

@@ -1447,15 +1447,6 @@ 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) {