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

am 991e4936: am cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev

Browse Source 
* commit '991e493616a644b6bb7fdea9a99990520d77348a':
  Don't perform layout while adjusting displays/stacks state.
This commit is contained in:
Filip Gruszczynski
2015-09-01 23:49:41 +00:00
committed by Android Git Automerger
parent 7f2b4b6a63 991e493616
commit dbf8c0d926
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -375,7 +375,10 @@ public class TaskStack {
for (int appNdx = appWindowTokens.size() - 1; appNdx >= 0; --appNdx) { for (int appNdx = appWindowTokens.size() - 1; appNdx >= 0; --appNdx) {
final WindowList appWindows = appWindowTokens.get(appNdx).allAppWindows; final WindowList appWindows = appWindowTokens.get(appNdx).allAppWindows;
for (int winNdx = appWindows.size() - 1; winNdx >= 0; --winNdx) { for (int winNdx = appWindows.size() - 1; winNdx >= 0; --winNdx) {
mService.removeWindowInnerLocked(appWindows.get(winNdx)); // We are in the middle of changing the state of displays/stacks/tasks. We need
// to finish that, before we let layout interfere with it.
mService.removeWindowInnerLocked(appWindows.get(winNdx),
false /* performLayout */);
doAnotherLayoutPass = true; doAnotherLayoutPass = true;
} }
} }

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

@@ -2793,6 +2793,10 @@ public class WindowManagerService extends IWindowManager.Stub
} }
void removeWindowInnerLocked(WindowState win) { void removeWindowInnerLocked(WindowState win) {
removeWindowInnerLocked(win, true);
}
void removeWindowInnerLocked(WindowState win, boolean performLayout) {
if (win.mRemoved) { if (win.mRemoved) {
// Nothing to do. // Nothing to do.
return; return;
@@ -2890,7 +2894,9 @@ public class WindowManagerService extends IWindowManager.Stub
if (displayContent != null) { if (displayContent != null) {
displayContent.layoutNeeded = true; displayContent.layoutNeeded = true;
} }
if (performLayout) {
performLayoutAndPlaceSurfacesLocked(); performLayoutAndPlaceSurfacesLocked();
}
if (win.mAppToken != null) { if (win.mAppToken != null) {
win.mAppToken.updateReportedVisibilityLocked(); win.mAppToken.updateReportedVisibilityLocked();
} }
@@ -5193,8 +5199,10 @@ public class WindowManagerService extends IWindowManager.Stub
} }
public void removeStack(int stackId) { public void removeStack(int stackId) {
synchronized (mWindowMap) {
mStackIdToStack.remove(stackId); mStackIdToStack.remove(stackId);
} }
}
public void removeTask(int taskId) { public void removeTask(int taskId) {
synchronized (mWindowMap) { synchronized (mWindowMap) {
@@ -5267,11 +5275,13 @@ public class WindowManagerService extends IWindowManager.Stub
} }
public void getStackBounds(int stackId, Rect bounds) { public void getStackBounds(int stackId, Rect bounds) {
synchronized (mWindowMap) {
final TaskStack stack = mStackIdToStack.get(stackId); final TaskStack stack = mStackIdToStack.get(stackId);
if (stack != null) { if (stack != null) {
stack.getBounds(bounds); stack.getBounds(bounds);
return; return;
} }
}
bounds.setEmpty(); bounds.setEmpty();
} }