diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-16 17:17:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-16 16:25:15 +0000 |
| commit | 2e7b2521f1758bf16935a9a879c595cc44eab37f (patch) | |
| tree | 785d72670dc95021fad4384acd9727dec1f8e127 | |
| parent | d543c3e113ffa82a63669feca540ca2e10b1576f (diff) | |
| parent | 73fd117c6566db42afbb791ac30da3910b549be5 (diff) | |
| download | frameworks_base-2e7b2521f1758bf16935a9a879c595cc44eab37f.zip frameworks_base-2e7b2521f1758bf16935a9a879c595cc44eab37f.tar.gz frameworks_base-2e7b2521f1758bf16935a9a879c595cc44eab37f.tar.bz2 | |
Merge "[ActivityManager]: Update home process when home activity resumed"
| -rwxr-xr-x | services/java/com/android/server/am/ActivityStack.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 3d66d84..75d32e3 100755 --- 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(); |