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

resolved conflicts for merge of 75f31740 to lmp-dev

Browse Source 
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
This commit is contained in:
Craig Mautner
2014-07-17 10:05:07 -07:00
parent fad2c9a257 75f317403f
commit efc81e7d5e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11173,17 +11173,17 @@ public class WindowManagerService extends IWindowManager.Stub
public void waitForAllWindowsDrawn(Runnable callback, long timeout) {
synchronized (mWindowMap) {
mWaitingForDrawnCallback = callback;
final WindowList windows = getDefaultWindowListLocked();
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowState win = windows.get(winNdx);
if (win.mHasSurface && win.isWinVisibleLw()) {
if (!win.mIsWallpaper) {
// Don't force wallpaper to redraw.
for (int displayNdx = mDisplayContents.size() - 1; displayNdx >= 0; --displayNdx) {
final WindowList windows =
mDisplayContents.valueAt(displayNdx).getWindowList();
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowState win = windows.get(winNdx);
if (win.mHasSurface && win.isWinVisibleLw() && !win.mIsWallpaper) {
win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;
// Force add to mResizingWindows.
win.mLastContentInsets.set(-1, -1, -1, -1);
mWaitingForDrawn.add(win);
}
// Force add to mResizingWindows.
win.mLastContentInsets.set(-1, -1, -1, -1);
mWaitingForDrawn.add(win);
}
}
requestTraversalLocked();