Merge "Made WindowToken.windows protected." (a8f1e224) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/AppWindowToken.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -501,7 +501,7 @@ class AppWindowToken extends WindowToken {
		w.clearAnimatingWithSavedSurface();
		w.mDestroying = true;
		w.mWinAnimator.hide("stopUsingSavedSurfaceLocked");
		w.mWinAnimator.mWallpaperControllerLocked.hideWallpapers(w);
		service.mWallpaperControllerLocked.hideWallpapers(w);
		}
		}
		destroySurfaces();

services/core/java/com/android/server/wm/WallpaperController.java

+29 −175

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER_LIGHT;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		@@ -43,7 +42,6 @@ import android.os.SystemClock;
		import android.util.Slog;
		import android.view.DisplayInfo;
		import android.view.WindowManager;
		import android.view.WindowManagerPolicy;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -92,7 +90,7 @@ class WallpaperController {
		// This is useful in cases where we don't want the wallpaper to be hidden when the close app
		// is a wallpaper target and is done animating out, but the opening app isn't a wallpaper
		// target and isn't done animating in.
		private WindowState mDeferredHideWallpaper = null;
		WindowState mDeferredHideWallpaper = null;

		// We give a wallpaper up to 500ms to finish drawing before playing app transitions.
		private static final long WALLPAPER_DRAW_PENDING_TIMEOUT_DURATION = 500;
		@@ -161,23 +159,8 @@ class WallpaperController {
		final int dh = displayInfo.logicalHeight;

		for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {
		WindowToken token = mWallpaperTokens.get(curTokenNdx);
		if (token.hidden == visible) {
		token.hidden = !visible;
		// Need to do a layout to ensure the wallpaper now has the
		// correct size.
		displayContent.layoutNeeded = true;
		}

		final WindowList windows = token.windows;
		for (int wallpaperNdx = windows.size() - 1; wallpaperNdx >= 0; wallpaperNdx--) {
		WindowState wallpaper = windows.get(wallpaperNdx);
		if (visible) {
		updateWallpaperOffset(wallpaper, dw, dh, false);
		}

		dispatchWallpaperVisibility(wallpaper, visible);
		}
		final WindowToken token = mWallpaperTokens.get(curTokenNdx);
		token.updateWallpaperVisibility(dw, dh, visible, displayContent);
		}
		}

		@@ -203,44 +186,10 @@ class WallpaperController {
		final boolean wasDeferred = (mDeferredHideWallpaper == winGoingAway);
		for (int i = mWallpaperTokens.size() - 1; i >= 0; i--) {
		final WindowToken token = mWallpaperTokens.get(i);
		for (int j = token.windows.size() - 1; j >= 0; j--) {
		final WindowState wallpaper = token.windows.get(j);
		final WindowStateAnimator winAnimator = wallpaper.mWinAnimator;
		if (!winAnimator.mLastHidden \|\| wasDeferred) {
		winAnimator.hide("hideWallpapers");
		dispatchWallpaperVisibility(wallpaper, false);
		final DisplayContent displayContent = wallpaper.getDisplayContent();
		if (displayContent != null) {
		displayContent.pendingLayoutChanges \|=
		WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
		}
		}
		}
		token.hideWallpaperToken(wasDeferred, "hideWallpapers");
		if (DEBUG_WALLPAPER_LIGHT && !token.hidden) Slog.d(TAG, "Hiding wallpaper " + token
		+ " from " + winGoingAway + " target=" + mWallpaperTarget + " lower="
		+ mLowerWallpaperTarget + "\n" + Debug.getCallers(5, " "));
		token.hidden = true;
		}
		}

		/**
		* Check wallpaper for visibility change and notify window if so.
		* @param wallpaper The wallpaper to test and notify.
		* @param visible Current visibility.
		*/
		void dispatchWallpaperVisibility(final WindowState wallpaper, final boolean visible) {
		// Only send notification if the visibility actually changed and we are not trying to hide
		// the wallpaper when we are deferring hiding of the wallpaper.
		if (wallpaper.mWallpaperVisible != visible
		&& (mDeferredHideWallpaper == null \|\| visible)) {
		wallpaper.mWallpaperVisible = visible;
		try {
		if (DEBUG_VISIBILITY \|\| DEBUG_WALLPAPER_LIGHT) Slog.v(TAG,
		"Updating vis of wallpaper " + wallpaper
		+ ": " + visible + " from:\n" + Debug.getCallers(4, " "));
		wallpaper.mClient.dispatchAppVisibility(visible);
		} catch (RemoteException e) {
		}
		}
		}

		@@ -351,17 +300,8 @@ class WallpaperController {
		\|\| window == mUpperWallpaperTarget) {
		boolean doWait = sync;
		for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {
		final WindowList windows = mWallpaperTokens.get(curTokenNdx).windows;
		for (int wallpaperNdx = windows.size() - 1; wallpaperNdx >= 0; wallpaperNdx--) {
		WindowState wallpaper = windows.get(wallpaperNdx);
		try {
		wallpaper.mClient.dispatchWallpaperCommand(action,
		x, y, z, extras, sync);
		// We only want to be synchronous with one wallpaper.
		sync = false;
		} catch (RemoteException e) {
		}
		}
		final WindowToken token = mWallpaperTokens.get(curTokenNdx);
		token.sendWindowWallpaperCommand(action, x, y, z, extras, sync);
		}

		if (doWait) {
		@@ -416,19 +356,7 @@ class WallpaperController {
		}

		for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {
		WindowList windows = mWallpaperTokens.get(curTokenNdx).windows;
		for (int wallpaperNdx = windows.size() - 1; wallpaperNdx >= 0; wallpaperNdx--) {
		WindowState wallpaper = windows.get(wallpaperNdx);
		if (updateWallpaperOffset(wallpaper, dw, dh, sync)) {
		WindowStateAnimator winAnimator = wallpaper.mWinAnimator;
		winAnimator.computeShownFrameLocked();
		// No need to lay out the windows - we can just set the wallpaper position
		// directly.
		winAnimator.setWallpaperOffset(wallpaper.mShownPosition);
		// We only want to be synchronous with one wallpaper.
		sync = false;
		}
		}
		mWallpaperTokens.get(curTokenNdx).updateWallpaperOffset(dw, dh, sync);
		}
		}

		@@ -464,13 +392,7 @@ class WallpaperController {
		if (DEBUG_LAYERS \|\| DEBUG_WALLPAPER) Slog.v(TAG, "Setting wallpaper layer adj to " + adj);
		mWallpaperAnimLayerAdjustment = adj;
		for (int i = mWallpaperTokens.size() - 1; i >= 0; i--) {
		WindowList windows = mWallpaperTokens.get(i).windows;
		for (int j = windows.size() - 1; j >= 0; j--) {
		WindowState wallpaper = windows.get(j);
		wallpaper.mWinAnimator.mAnimLayer = wallpaper.mLayer + adj;
		if (DEBUG_LAYERS \|\| DEBUG_WALLPAPER) Slog.v(TAG, "setWallpaper win "
		+ wallpaper + " anim layer: " + wallpaper.mWinAnimator.mAnimLayer);
		}
		mWallpaperTokens.get(i).adjustAnimLayer(adj);
		}
		}

		@@ -695,76 +617,12 @@ class WallpaperController {
		final int dw = displayInfo.logicalWidth;
		final int dh = displayInfo.logicalHeight;

		// Start stepping backwards from here, ensuring that our wallpaper windows
		// are correctly placed.
		// Start stepping backwards from here, ensuring that our wallpaper windows are correctly placed.
		boolean changed = false;
		for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {
		WindowToken token = mWallpaperTokens.get(curTokenNdx);
		if (token.hidden == visible) {
		if (DEBUG_WALLPAPER_LIGHT) Slog.d(TAG,
		"Wallpaper token " + token + " hidden=" + !visible);
		token.hidden = !visible;
		// Need to do a layout to ensure the wallpaper now has the correct size.
		mService.getDefaultDisplayContentLocked().layoutNeeded = true;
		}

		final WindowList tokenWindows = token.windows;
		for (int wallpaperNdx = tokenWindows.size() - 1; wallpaperNdx >= 0; wallpaperNdx--) {
		WindowState wallpaper = tokenWindows.get(wallpaperNdx);

		if (visible) {
		updateWallpaperOffset(wallpaper, dw, dh, false);
		}

		// First, make sure the client has the current visibility state.
		dispatchWallpaperVisibility(wallpaper, visible);

		wallpaper.mWinAnimator.mAnimLayer =
		wallpaper.mLayer + mWallpaperAnimLayerAdjustment;
		if (DEBUG_LAYERS \|\| DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "adjustWallpaper win "
		+ wallpaper + " anim layer: " + wallpaper.mWinAnimator.mAnimLayer);

		// First, if this window is at the current index, then all is well.
		if (wallpaper == wallpaperTarget) {
		wallpaperTargetIndex--;
		wallpaperTarget = wallpaperTargetIndex > 0
		? windows.get(wallpaperTargetIndex - 1) : null;
		continue;
		}

		// The window didn't match... the current wallpaper window,
		// wherever it is, is in the wrong place, so make sure it is not in the list.
		int oldIndex = windows.indexOf(wallpaper);
		if (oldIndex >= 0) {
		if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG,
		"Wallpaper removing at " + oldIndex + ": " + wallpaper);
		windows.remove(oldIndex);
		mService.mWindowsChanged = true;
		if (oldIndex < wallpaperTargetIndex) {
		wallpaperTargetIndex--;
		}
		}

		// Now stick it in. For apps over wallpaper keep the wallpaper at the bottommost
		// layer. For keyguard over wallpaper put the wallpaper under the keyguard.
		int insertionIndex = 0;
		if (visible && wallpaperTarget != null) {
		final int type = wallpaperTarget.mAttrs.type;
		final int privateFlags = wallpaperTarget.mAttrs.privateFlags;
		if ((privateFlags & PRIVATE_FLAG_KEYGUARD) != 0
		\|\| type == TYPE_KEYGUARD_SCRIM) {
		insertionIndex = windows.indexOf(wallpaperTarget);
		}
		}
		if (DEBUG_WALLPAPER_LIGHT \|\| DEBUG_WINDOW_MOVEMENT
		\|\| (DEBUG_ADD_REMOVE && oldIndex != insertionIndex)) Slog.v(TAG,
		"Moving wallpaper " + wallpaper
		+ " from " + oldIndex + " to " + insertionIndex);

		windows.add(insertionIndex, wallpaper);
		mService.mWindowsChanged = true;
		changed = true;
		}
		final WindowToken token = mWallpaperTokens.get(curTokenNdx);
		changed \|= token.updateWallpaperWindowsPlacement(windows, wallpaperTarget,
		wallpaperTargetIndex, visible, dw, dh, mWallpaperAnimLayerAdjustment);
		}

		return changed;
		@@ -836,11 +694,8 @@ class WallpaperController {
		boolean wallpaperReady = true;
		for (int curTokenIndex = mWallpaperTokens.size() - 1;
		curTokenIndex >= 0 && wallpaperReady; curTokenIndex--) {
		WindowToken token = mWallpaperTokens.get(curTokenIndex);
		for (int curWallpaperIndex = token.windows.size() - 1; curWallpaperIndex >= 0;
		curWallpaperIndex--) {
		WindowState wallpaper = token.windows.get(curWallpaperIndex);
		if (wallpaper.mWallpaperVisible && !wallpaper.isDrawnLw()) {
		final WindowToken token = mWallpaperTokens.get(curTokenIndex);
		if (token.hasVisibleNotDrawnWallpaper()) {
		// We've told this wallpaper to be visible, but it is not drawn yet
		wallpaperReady = false;
		if (mWallpaperDrawState != WALLPAPER_DRAW_TIMEOUT) {
		@@ -859,7 +714,6 @@ class WallpaperController {
		break;
		}
		}
		}
		if (wallpaperReady) {
		mWallpaperDrawState = WALLPAPER_DRAW_NORMAL;
		mService.mH.removeMessages(WALLPAPER_DRAW_PENDING_TIMEOUT);

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

+25 −455

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/WindowState.java

+90 −3

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_CONFIGURATION;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS_LIGHT;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT;
		@@ -112,6 +113,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_RESIZE;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STARTING_WINDOW;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_SURFACE_TRACE;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER_LIGHT;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
		@@ -656,9 +658,7 @@ class WindowState extends WindowContainer implements WindowManagerPolicy.WindowS
		}

		void attach() {
		if (WindowManagerService.localLOGV) Slog.v(
		TAG, "Attaching " + this + " token=" + mToken
		+ ", list=" + mToken.windows);
		if (WindowManagerService.localLOGV) Slog.v(TAG, "Attaching " + this + " token=" + mToken);
		mSession.windowAddedLocked();
		}

		@@ -3210,4 +3210,91 @@ class WindowState extends WindowContainer implements WindowManagerPolicy.WindowS
		public boolean isRtl() {
		return mMergedConfiguration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
		}

		void hideWallpaperWindow(boolean wasDeferred, String reason) {
		if (!mWinAnimator.mLastHidden \|\| wasDeferred) {
		mWinAnimator.hide(reason);
		dispatchWallpaperVisibility(false);
		final DisplayContent displayContent = getDisplayContent();
		if (displayContent != null) {
		displayContent.pendingLayoutChanges \|= FINISH_LAYOUT_REDO_WALLPAPER;
		}
		}
		}

		/**
		* Check wallpaper window for visibility change and notify window if so.
		* @param visible Current visibility.
		*/
		void dispatchWallpaperVisibility(final boolean visible) {
		final boolean hideAllowed =
		mService.mWallpaperControllerLocked.mDeferredHideWallpaper == null;

		// Only send notification if the visibility actually changed and we are not trying to hide
		// the wallpaper when we are deferring hiding of the wallpaper.
		if (mWallpaperVisible != visible && (hideAllowed \|\| visible)) {
		mWallpaperVisible = visible;
		try {
		if (DEBUG_VISIBILITY \|\| DEBUG_WALLPAPER_LIGHT) Slog.v(TAG,
		"Updating vis of wallpaper " + this
		+ ": " + visible + " from:\n" + Debug.getCallers(4, " "));
		mClient.dispatchAppVisibility(visible);
		} catch (RemoteException e) {
		}
		}
		}

		/** Places this window after the input window in the window list. */
		void addWindowToListAfter(WindowState pos) {
		final WindowList windows = pos.getWindowList();
		final int i = windows.indexOf(pos);
		if (DEBUG_FOCUS \|\| DEBUG_WINDOW_MOVEMENT \|\| DEBUG_ADD_REMOVE) Slog.v(TAG_WM,
		"Adding window " + this + " at " + (i+1) + " of " + windows.size()
		+ " (after " + pos + ")");
		windows.add(i+1, this);
		mService.mWindowsChanged = true;
		}

		/** Places this window before the input window in the window list. */
		void addWindowToListBefore(WindowState pos) {
		final WindowList windows = pos.getWindowList();
		int i = windows.indexOf(pos);
		if (DEBUG_FOCUS \|\| DEBUG_WINDOW_MOVEMENT \|\| DEBUG_ADD_REMOVE) Slog.v(TAG_WM,
		"Adding window " + this + " at " + i + " of " + windows.size()
		+ " (before " + pos + ")");
		if (i < 0) {
		Slog.w(TAG_WM, "addWindowToListBefore: Unable to find " + pos + " in " + windows);
		i = 0;
		}
		windows.add(i, this);
		mService.mWindowsChanged = true;
		}

		/** Adds this non-app window to the window list. */
		void addNonAppWindowToList() {
		final WindowList windows = getWindowList();

		// Figure out where window should go, based on layer.
		int i;
		for (i = windows.size() - 1; i >= 0; i--) {
		final WindowState otherWin = windows.get(i);
		if (otherWin.getBaseType() != TYPE_WALLPAPER && otherWin.mBaseLayer <= mBaseLayer) {
		// Wallpaper wanders through the window list, for example to position itself
		// directly behind keyguard. Because of this it will break the ordering based on
		// WindowState.mBaseLayer. There might windows with higher mBaseLayer behind it and
		// we don't want the new window to appear above them. An example of this is adding
		// of the docked stack divider. Consider a scenario with the following ordering (top
		// to bottom): keyguard, wallpaper, assist preview, apps. We want the dock divider
		// to land below the assist preview, so the dock divider must ignore the wallpaper,
		// with which it shares the base layer.
		break;
		}
		}

		i++;
		if (DEBUG_FOCUS \|\| DEBUG_WINDOW_MOVEMENT \|\| DEBUG_ADD_REMOVE) Slog.v(TAG_WM,
		"Free window: Adding window " + this + " at " + i + " of " + windows.size());
		windows.add(i, this);
		mService.mWindowsChanged = true;
		}
		}

services/core/java/com/android/server/wm/WindowStateAnimator.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ class WindowStateAnimator {
		final WindowManagerPolicy mPolicy;
		final Context mContext;
		final boolean mIsWallpaper;
		final WallpaperController mWallpaperControllerLocked;
		private final WallpaperController mWallpaperControllerLocked;

		// Currently running animation.
		boolean mAnimating;
		@@ -1521,7 +1521,7 @@ class WindowStateAnimator {
		mAnimator.requestRemovalOfReplacedWindows(w);
		mLastHidden = false;
		if (mIsWallpaper) {
		mWallpaperControllerLocked.dispatchWallpaperVisibility(w, true);
		w.dispatchWallpaperVisibility(true);
		}
		// This draw means the difference between unique content and mirroring.
		// Run another pass through performLayout to set mHasContent in the