From 84b08adcbb71fcaa860987f341310c7902a5a7ac Mon Sep 17 00:00:00 2001
From: Prashant Malani <pmalani@google.com>
Date: Tue, 15 Jul 2014 16:28:24 -0700
Subject: 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
---
 .../core/java/com/android/server/am/ActivityStackSupervisor.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'services')

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);
-- 
cgit v1.1