am 80b13579: am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"

* commit '80b1357909e57aa330c2624b8a5baac9f3bdce3f': Avoid duplication of AppWindowToken in created Task
2014-03-04 17:21:11 +00:00
parent 79181fca69 80b1357909
commit f716acc66f
1 changed files with 2 additions and 1 deletions
--- 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);
        }
    }