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

am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

Browse Source 
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
This commit is contained in:
Prashant Malani
2014-07-17 19:55:32 +00:00
committed by Android Git Automerger
parent bbc499415c 9353e1a2b2
commit 162d943350
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1962,10 +1962,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
thumbnails = null; thumbnails = null;
} }
if (isFrontStack(mHomeStack)) { booting = mService.mBooting;
booting = mService.mBooting; mService.mBooting = false;
mService.mBooting = false;
}
if (mStartingUsers.size() > 0) { if (mStartingUsers.size() > 0) {
startingUsers = new ArrayList<UserStartedState>(mStartingUsers); startingUsers = new ArrayList<UserStartedState>(mStartingUsers);