Merge "Remove iterators." (b48fe0ec) · Commits · e / os / android_frameworks_base

services/java/com/android/server/wm/InputMonitor.java

+35 −34

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,6 @@ package com.android.server.wm;
	import com.android.server.input.InputManagerService;		import com.android.server.input.InputManagerService;
	import com.android.server.input.InputApplicationHandle;		import com.android.server.input.InputApplicationHandle;
	import com.android.server.input.InputWindowHandle;		import com.android.server.input.InputWindowHandle;
	import com.android.server.wm.WindowManagerService.AllWindowsIterator;

	import android.app.ActivityManagerNative;		import android.app.ActivityManagerNative;
	import android.graphics.Rect;		import android.graphics.Rect;
	@@ -259,10 +258,11 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
	}		}

	// Add all windows on the default display.		// Add all windows on the default display.
	final AllWindowsIterator iterator = mService.new AllWindowsIterator(		final int numDisplays = mService.mDisplayContents.size();
	WindowManagerService.REVERSE_ITERATOR);		for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
	while (iterator.hasNext()) {		WindowList windows = mService.mDisplayContents.valueAt(displayNdx).getWindowList();
	final WindowState child = iterator.next();		for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
			final WindowState child = windows.get(winNdx);
	final InputChannel inputChannel = child.mInputChannel;		final InputChannel inputChannel = child.mInputChannel;
	final InputWindowHandle inputWindowHandle = child.mInputWindowHandle;		final InputWindowHandle inputWindowHandle = child.mInputWindowHandle;
	if (inputChannel == null \|\| inputWindowHandle == null \|\| child.mRemoved) {		if (inputChannel == null \|\| inputWindowHandle == null \|\| child.mRemoved) {
	@@ -300,6 +300,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
	isVisible, hasFocus, hasWallpaper);		isVisible, hasFocus, hasWallpaper);
	}		}
	}		}
			}

	// Send windows to native code.		// Send windows to native code.
	mService.mInputManager.setInputWindows(mInputWindowHandles);		mService.mInputManager.setInputWindows(mInputWindowHandles);

services/java/com/android/server/wm/WindowAnimator.java

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@ import android.view.SurfaceControl;
	import android.view.WindowManagerPolicy;		import android.view.WindowManagerPolicy;
	import android.view.animation.Animation;		import android.view.animation.Animation;

	import com.android.server.wm.WindowManagerService.DisplayContentsIterator;
	import com.android.server.wm.WindowManagerService.LayoutFields;		import com.android.server.wm.WindowManagerService.LayoutFields;

	import java.io.PrintWriter;		import java.io.PrintWriter;
	@@ -541,9 +540,9 @@ public class WindowAnimator {
	}		}

	boolean hasPendingLayoutChanges = false;		boolean hasPendingLayoutChanges = false;
	DisplayContentsIterator iterator = mService.new DisplayContentsIterator();		final int numDisplays = mService.mDisplayContents.size();
	while (iterator.hasNext()) {		for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
	final DisplayContent displayContent = iterator.next();		final DisplayContent displayContent = mService.mDisplayContents.get(displayNdx);
	final int pendingChanges = getPendingLayoutChanges(displayContent.getDisplayId());		final int pendingChanges = getPendingLayoutChanges(displayContent.getDisplayId());
	if ((pendingChanges & WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER) != 0) {		if ((pendingChanges & WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER) != 0) {
	mBulkUpdateParams \|= SET_WALLPAPER_ACTION_PENDING;		mBulkUpdateParams \|= SET_WALLPAPER_ACTION_PENDING;

services/java/com/android/server/wm/WindowManagerService.java

+184 −245

File changed.

Preview size limit exceeded, changes collapsed.