summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@android.com> 2014-03-18 11:31:34 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-18 11:31:34 -0700
commitd1d91eca3e78f2074b110a0e3530aeff6deef6fe (patch)
treec114de8ba9344c169aa4412e8bf6dcaa970b3d8b
parentd2133079c085cb0879facc8ee72678524d22571a (diff)
parent7cb1dfe690b2d700ce212712287dfd59c2c8e43f (diff)
am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
* commit '7cb1dfe690b2d700ce212712287dfd59c2c8e43f': Insufficient ProcessRecord cleanup when persistent process is killed
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 91565e37b497..97696a5d8fbf 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -12435,6 +12435,7 @@ public final class ActivityManagerService extends ActivityManagerNative
app.foregroundActivities = false;
app.hasShownUi = false;
app.hasAboveClient = false;
+ app.hasClientActivities = false;
mServices.killServicesLocked(app, allowRestart);