Merge "[ActivityManager]: Update home process when home activity resumed"

2014-07-16 17:17:46 +00:00
parent d543c3e113 73fd117c65
commit 2e7b2521f1
1 changed files with 8 additions and 0 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -957,6 +957,14 @@ final class ActivityStack {
        next.idle = false;
        next.results = null;
        next.newIntents = null;
+
+        if (next.isHomeActivity() && next.isNotResolverActivity()) {
+            ProcessRecord app = next.task.mActivities.get(0).app;
+            if (app != null && app != mService.mHomeProcess) {
+                mService.mHomeProcess = app;
+            }
+        }
+
        if (next.nowVisible) {
            // We won't get a call to reportActivityVisibleLocked() so dismiss lockscreen now.
            mStackSupervisor.dismissKeyguard();