diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-04 17:55:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 17:55:47 +0000 |
| commit | 2e416f16745c55b4957611cb3fa5acc82f247092 (patch) | |
| tree | 301d58791159dae4bb0634aaf29bb65dac9f9429 /services/core/java | |
| parent | d5273da95b333b018c0d13bd6917a1e8a769f064 (diff) | |
| parent | f716acc66f2c30503f8c10f57ecba3d597107801 (diff) | |
| download | frameworks_base-2e416f16745c55b4957611cb3fa5acc82f247092.zip frameworks_base-2e416f16745c55b4957611cb3fa5acc82f247092.tar.gz frameworks_base-2e416f16745c55b4957611cb3fa5acc82f247092.tar.bz2 | |
am f716acc6: am 80b13579: am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"
* commit 'f716acc66f2c30503f8c10f57ecba3d597107801':
Avoid duplication of AppWindowToken in created Task
Diffstat (limited to 'services/core/java')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 6e1724a..c006613 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -3522,8 +3522,9 @@ public class WindowManagerService extends IWindowManager.Stub Task newTask = mTaskIdToTask.get(groupId); if (newTask == null) { newTask = createTask(groupId, oldTask.mStack.mStackId, oldTask.mUserId, atoken); + } else { + newTask.mAppTokens.add(atoken); } - newTask.mAppTokens.add(atoken); } } |