Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7a93aa2fc2555b0de41bb5f30eb0e9cce2413084':
  Avoid duplication of AppWindowToken in created Task
This commit is contained in:
Craig Mautner
2014-03-04 17:14:58 +00:00
committed by Android Git Automerger
parent 1a85d0f770 7a93aa2fc2
commit 80b1357909
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3522,10 +3522,11 @@ 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);
} }
} }
}
public int getOrientationFromWindowsLocked() { public int getOrientationFromWindowsLocked() {
if (mDisplayFrozen || mOpeningApps.size() > 0 || mClosingApps.size() > 0) { if (mDisplayFrozen || mOpeningApps.size() > 0 || mClosingApps.size() > 0) {