drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"

Browse Source 
* commit 'a0b4d0ce471cf10888bac4d4ec5b97fd562ad756':
  Avoid duplication of AppWindowToken in created Task
This commit is contained in:
Craig Mautner
2014-03-04 09:10:36 -08:00
committed by Android Git Automerger
parent 3ce2b57d15 a0b4d0ce47
commit 7a93aa2fc2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -3480,8 +3480,9 @@ public class WindowManagerService extends IWindowManager.Stub
Task newTask = mTaskIdToTask.get(groupId); Task newTask = mTaskIdToTask.get(groupId);
if (newTask == null) { if (newTask == null) {
newTask = createTask(groupId, oldTask.mStack.mStackId, oldTask.mUserId, atoken); newTask = createTask(groupId, oldTask.mStack.mStackId, oldTask.mUserId, atoken);
} else {
newTask.mAppTokens.add(atoken);
} }
newTask.mAppTokens.add(atoken);
} }
} }