diff options
author | Mathias Agopian <mathias@google.com> | 2011-04-21 17:14:18 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-21 17:14:18 -0700 |
commit | 5db1314192b462f3666455fdae42a96ec2918ce9 (patch) | |
tree | 008b1830d7e9aef13f1b4d56a7096b6629192a6c /libs | |
parent | b104800b6cfaec78e5912015c63f8fc6a2437d0e (diff) | |
parent | 9638e5c167be321643bf3f3ee39e3fb45541fb3b (diff) | |
download | frameworks_base-5db1314192b462f3666455fdae42a96ec2918ce9.zip frameworks_base-5db1314192b462f3666455fdae42a96ec2918ce9.tar.gz frameworks_base-5db1314192b462f3666455fdae42a96ec2918ce9.tar.bz2 |
Merge "Get rid of the "pid" parameter from createSurface"
Diffstat (limited to 'libs')
-rw-r--r-- | libs/gui/ISurfaceComposerClient.cpp | 5 | ||||
-rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp index 7730eb1..ea38e08 100644 --- a/libs/gui/ISurfaceComposerClient.cpp +++ b/libs/gui/ISurfaceComposerClient.cpp @@ -83,7 +83,6 @@ public: } virtual sp<ISurface> createSurface( surface_data_t* params, - int pid, const String8& name, DisplayID display, uint32_t w, @@ -93,7 +92,6 @@ public: { Parcel data, reply; data.writeInterfaceToken(ISurfaceComposerClient::getInterfaceDescriptor()); - data.writeInt32(pid); data.writeString8(name); data.writeInt32(display); data.writeInt32(w); @@ -172,14 +170,13 @@ status_t BnSurfaceComposerClient::onTransact( case CREATE_SURFACE: { CHECK_INTERFACE(ISurfaceComposerClient, data, reply); surface_data_t params; - int32_t pid = data.readInt32(); String8 name = data.readString8(); DisplayID display = data.readInt32(); uint32_t w = data.readInt32(); uint32_t h = data.readInt32(); PixelFormat format = data.readInt32(); uint32_t flags = data.readInt32(); - sp<ISurface> s = createSurface(¶ms, pid, name, display, w, h, + sp<ISurface> s = createSurface(¶ms, name, display, w, h, format, flags); params.writeToParcel(reply); reply->writeStrongBinder(s->asBinder()); diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index d336724..a1ff2c1 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -273,7 +273,6 @@ ssize_t SurfaceComposerClient::getNumberOfDisplays() } sp<SurfaceControl> SurfaceComposerClient::createSurface( - int pid, DisplayID display, uint32_t w, uint32_t h, @@ -286,12 +285,11 @@ sp<SurfaceControl> SurfaceComposerClient::createSurface( snprintf(buffer, SIZE, "<pid_%d>", getpid()); name.append(buffer); - return SurfaceComposerClient::createSurface(pid, name, display, + return SurfaceComposerClient::createSurface(name, display, w, h, format, flags); } sp<SurfaceControl> SurfaceComposerClient::createSurface( - int pid, const String8& name, DisplayID display, uint32_t w, @@ -302,7 +300,7 @@ sp<SurfaceControl> SurfaceComposerClient::createSurface( sp<SurfaceControl> result; if (mStatus == NO_ERROR) { ISurfaceComposerClient::surface_data_t data; - sp<ISurface> surface = mClient->createSurface(&data, pid, name, + sp<ISurface> surface = mClient->createSurface(&data, name, display, w, h, format, flags); if (surface != 0) { result = new SurfaceControl(this, surface, data, w, h, format, flags); |