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

Merge "Avoid duplication of AppWindowToken in created Task"

Browse Source
This commit is contained in:
Craig Mautner
2014-03-04 15:19:17 +00:00
committed by Gerrit Code Review
parent 9404752d50 c36a5b9c36
commit a0b4d0ce47
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,10 +3480,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) {