summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-02-21 07:24:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-21 07:24:16 -0800
commit06d91936eb15189bab020c4ea4f6ba9eba4f98e9 (patch)
treea1f32f57f9a7cb7d95b7302ae23c97d057fb5753 /services/surfaceflinger
parent2601dccdc0145a24edcfc9949dc1eff83ceff3c6 (diff)
parentc93dd55877b5a6c0c38e63e63e0111dc6011b1f9 (diff)
downloadframeworks_base-06d91936eb15189bab020c4ea4f6ba9eba4f98e9.zip
frameworks_base-06d91936eb15189bab020c4ea4f6ba9eba4f98e9.tar.gz
frameworks_base-06d91936eb15189bab020c4ea4f6ba9eba4f98e9.tar.bz2
Merge "createSurface getpid() first parameter was removed"
Diffstat (limited to 'services/surfaceflinger')
-rw-r--r--services/surfaceflinger/tests/resize/resize.cpp2
-rw-r--r--services/surfaceflinger/tests/surface/surface.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/tests/resize/resize.cpp b/services/surfaceflinger/tests/resize/resize.cpp
index 56b2a8f..7f3f064 100644
--- a/services/surfaceflinger/tests/resize/resize.cpp
+++ b/services/surfaceflinger/tests/resize/resize.cpp
@@ -39,7 +39,7 @@ int main(int argc, char** argv)
// create a client to surfaceflinger
sp<SurfaceComposerClient> client = new SurfaceComposerClient();
- sp<Surface> surface = client->createSurface(getpid(), 0, 160, 240,
+ sp<Surface> surface = client->createSurface(0, 160, 240,
PIXEL_FORMAT_RGB_565);
diff --git a/services/surfaceflinger/tests/surface/surface.cpp b/services/surfaceflinger/tests/surface/surface.cpp
index 8e1c3fe..9c15f9b 100644
--- a/services/surfaceflinger/tests/surface/surface.cpp
+++ b/services/surfaceflinger/tests/surface/surface.cpp
@@ -38,7 +38,7 @@ int main(int argc, char** argv)
sp<SurfaceComposerClient> client = new SurfaceComposerClient();
sp<SurfaceControl> surfaceControl = client->createSurface(
- getpid(), 0, 160, 240, PIXEL_FORMAT_RGB_565);
+ 0, 160, 240, PIXEL_FORMAT_RGB_565);
SurfaceComposerClient::openGlobalTransaction();
surfaceControl->setLayer(100000);
SurfaceComposerClient::closeGlobalTransaction();