Merge "Merge "Fix bounds calculation" into oc-dev am: d1422b56ad am: 395d9acb46" (1ec41fdf) · Commits · e / os / android_frameworks_base

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

+22 −20

Original line number	Diff line number	Diff line
		@@ -2948,7 +2948,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		}

		// Don't include wallpaper in bounds calculation
		if (!mutableIncludeFullDisplay.value && includeDecor) {
		if (!w.mIsWallpaper && !mutableIncludeFullDisplay.value) {
		if (includeDecor) {
		final TaskStack stack = w.getStack();
		if (stack != null) {
		stack.getBounds(frame);
		@@ -2957,7 +2958,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		// We want to screenshot with the exact bounds of the surface of the app. Thus,
		// intersect it with the frame.
		frame.intersect(w.mFrame);
		}else if (!mutableIncludeFullDisplay.value && !w.mIsWallpaper) {
		} else {
		final Rect wf = w.mFrame;
		final Rect cr = w.mContentInsets;
		int left = wf.left + cr.left;
		@@ -2971,6 +2972,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		frame.setEmpty();
		}
		}
		}

		final boolean foundTargetWs =
		(w.mAppToken != null && w.mAppToken.token == appToken)