Merge "Take screenshot before hiding the WSA." (7bcbdd22) · Commits · e / os / android_frameworks_base

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

+14 −11

Original line number	Diff line number	Diff line
		@@ -475,6 +475,20 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		setClientHidden(!visible);
		}

		if (!mService.mClosingApps.contains(this) && !mService.mOpeningApps.contains(this)) {
		// The token is not closing nor opening, so even if there is an animation set, that
		// doesn't mean that it goes through the normal app transition cycle so we have
		// to inform the docked controller about visibility change.
		// TODO(multi-display): notify docked divider on all displays where visibility was
		// affected.
		mService.getDefaultDisplayContentLocked().getDockedDividerController()
		.notifyAppVisibilityChanged();

		// Take the screenshot before possibly hiding the WSA, otherwise the screenshot
		// will not be taken.
		mService.mTaskSnapshotController.notifyAppVisibilityChanged(this, visible);
		}

		// If we are hidden but there is no delay needed we immediately
		// apply the Surface transaction so that the ActivityManager
		// can have some guarantee on the Surface state following
		@@ -492,17 +506,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		}
		SurfaceControl.closeTransaction();
		}

		if (!mService.mClosingApps.contains(this) && !mService.mOpeningApps.contains(this)) {
		// The token is not closing nor opening, so even if there is an animation set, that
		// doesn't mean that it goes through the normal app transition cycle so we have
		// to inform the docked controller about visibility change.
		// TODO(multi-display): notify docked divider on all displays where visibility was
		// affected.
		mService.getDefaultDisplayContentLocked().getDockedDividerController()
		.notifyAppVisibilityChanged();
		mService.mTaskSnapshotController.notifyAppVisibilityChanged(this, visible);
		}
		}

		return delayed;