Merge "Remove unused "layer" argument from show()." into jb-mr1-dev

Jeff Brown · Android (Google) Code Review · commit 233c667061ae · 2012-08-27T17:17:40.000-07:00
diff --git a/services/input/SpriteController.cpp b/services/input/SpriteController.cpp
@@ -298,7 +298,7 @@ void SpriteController::doUpdateSprites() {
             }
 
             if (becomingVisible) {
-                status = update.state.surfaceControl->show(surfaceLayer);
+                status = update.state.surfaceControl->show();
                 if (status) {
                     ALOGE("Error %d showing sprite surface.", status);
                 } else {

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ void SpriteController::doUpdateSprites() {`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`if (becomingVisible) {`
`301`		`- status = update.state.surfaceControl->show(surfaceLayer);`
	`301`	`+ status = update.state.surfaceControl->show();`
`302`	`302`	`if (status) {`
`303`	`303`	`ALOGE("Error %d showing sprite surface.", status);`
`304`	`304`	`} else {`