summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-04-25 16:58:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-25 16:58:01 -0700
commit9e797784d58393bc9cff894de1e464563354d2d3 (patch)
tree602538837ce778a9c32ee8cc00928b205df46925
parent46baa14f27eb08b55434bf6e9cf9bcc9c9dbc17f (diff)
parent5dbf2ed575c424a0d65e70458d5a02eb21872b33 (diff)
downloadframeworks_base-9e797784d58393bc9cff894de1e464563354d2d3.zip
frameworks_base-9e797784d58393bc9cff894de1e464563354d2d3.tar.gz
frameworks_base-9e797784d58393bc9cff894de1e464563354d2d3.tar.bz2
Merge "libgui: Fix the tests so they build."
-rw-r--r--libs/gui/tests/SurfaceTexture_test.cpp2
-rw-r--r--libs/gui/tests/Surface_test.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp
index 4184463..6c71343 100644
--- a/libs/gui/tests/SurfaceTexture_test.cpp
+++ b/libs/gui/tests/SurfaceTexture_test.cpp
@@ -76,7 +76,7 @@ protected:
mComposerClient = new SurfaceComposerClient;
ASSERT_EQ(NO_ERROR, mComposerClient->initCheck());
- mSurfaceControl = mComposerClient->createSurface(getpid(),
+ mSurfaceControl = mComposerClient->createSurface(
String8("Test Surface"), 0,
getSurfaceWidth(), getSurfaceHeight(),
PIXEL_FORMAT_RGB_888, 0);
diff --git a/libs/gui/tests/Surface_test.cpp b/libs/gui/tests/Surface_test.cpp
index fd07479..440a48b 100644
--- a/libs/gui/tests/Surface_test.cpp
+++ b/libs/gui/tests/Surface_test.cpp
@@ -30,7 +30,7 @@ protected:
mComposerClient = new SurfaceComposerClient;
ASSERT_EQ(NO_ERROR, mComposerClient->initCheck());
- mSurfaceControl = mComposerClient->createSurface(getpid(),
+ mSurfaceControl = mComposerClient->createSurface(
String8("Test Surface"), 0, 32, 32, PIXEL_FORMAT_RGB_888, 0);
ASSERT_TRUE(mSurfaceControl != NULL);