commit d1d91eca3e78f2074b110a0e3530aeff6deef6fe
author Dianne Hackborn <hackbod@android.com> Tue Mar 18 11:31:34 2014 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 18 11:31:34 2014 -0700
tree c114de8ba9344c169aa4412e8bf6dcaa970b3d8b
parent d2133079c085cb0879facc8ee72678524d22571a
parent 7cb1dfe690b2d700ce212712287dfd59c2c8e43f

am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

* commit '7cb1dfe690b2d700ce212712287dfd59c2c8e43f':
  Insufficient ProcessRecord cleanup when persistent process is killed

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 91565e3..97696a5 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -12435,6 +12435,7 @@
         app.foregroundActivities = false;
         app.hasShownUi = false;
         app.hasAboveClient = false;
+        app.hasClientActivities = false;
 
         mServices.killServicesLocked(app, allowRestart);