Merge "Use Surface layer for Surface operation." into jb-dev

Craig Mautner · Android (Google) Code Review · commit 35c60c944a93 · 2012-05-31T15:35:56.000-07:00
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
@@ -5437,8 +5437,8 @@ public Bitmap screenshotApplications(IBinder appToken, int width, int height) {
                 // window.
                 including = !ws.mIsImWindow && !ws.isFullscreen(dw, dh);
 
-                if (maxLayer < ws.mWinAnimator.mAnimLayer) {
-                    maxLayer = ws.mWinAnimator.mAnimLayer;
+                if (maxLayer < ws.mWinAnimator.mSurfaceLayer) {
+                    maxLayer = ws.mWinAnimator.mSurfaceLayer;
                 }
                 
                 // Don't include wallpaper in bounds calculation

Original file line number	Diff line number	Diff line change
`@@ -5437,8 +5437,8 @@ public Bitmap screenshotApplications(IBinder appToken, int width, int height) {`
`5437`	`5437`	`// window.`
`5438`	`5438`	`including = !ws.mIsImWindow && !ws.isFullscreen(dw, dh);`
`5439`	`5439`
`5440`		`- if (maxLayer < ws.mWinAnimator.mAnimLayer) {`
`5441`		`- maxLayer = ws.mWinAnimator.mAnimLayer;`
	`5440`	`+ if (maxLayer < ws.mWinAnimator.mSurfaceLayer) {`
	`5441`	`+ maxLayer = ws.mWinAnimator.mSurfaceLayer;`
`5442`	`5442`	`}`
`5443`	`5443`
`5444`	`5444`	`// Don't include wallpaper in bounds calculation`