Merge "Avoid duplication of AppWindowToken in created Task"

2014-03-04 15:19:17 +00:00
parent 9404752d50 c36a5b9c36
commit a0b4d0ce47
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -3480,8 +3480,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);
        }
    }