diff options
| author | Prashant Malani <pmalani@google.com> | 2014-07-15 16:28:24 -0700 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2014-07-18 23:10:08 +0000 |
| commit | 84b08adcbb71fcaa860987f341310c7902a5a7ac (patch) | |
| tree | ed7489197756674433c07ba4b7b0de8ba374a055 /services | |
| parent | 8f8141e24f4d890b4281b8c558ecc60efe5831c4 (diff) | |
| download | frameworks_base-84b08adcbb71fcaa860987f341310c7902a5a7ac.zip frameworks_base-84b08adcbb71fcaa860987f341310c7902a5a7ac.tar.gz frameworks_base-84b08adcbb71fcaa860987f341310c7902a5a7ac.tar.bz2 | |
Make the booting flag update unconditional
In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.
Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560
Conflicts:
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 9d1f8c6..c6dbfba 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2125,10 +2125,8 @@ public final class ActivityStackSupervisor implements DisplayListener { mFinishingActivities.clear(); } - if (isFrontStack(mHomeStack)) { - booting = mService.mBooting; - mService.mBooting = false; - } + booting = mService.mBooting; + mService.mBooting = false; if (mStartingUsers.size() > 0) { startingUsers = new ArrayList<UserStartedState>(mStartingUsers); |