diff options
| author | Chong Zhang <chz@google.com> | 2013-08-23 23:18:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-23 23:18:18 +0000 |
| commit | 33142e1e318c0c766a385d88d2434f62f9e2dfe7 (patch) | |
| tree | 7834e6bcc639ce13eafd275f7ceb6770fec9b865 /media/libmedia | |
| parent | 2484040e0f413989e4edbe26ba3bf71122382af6 (diff) | |
| parent | 87ecf19404586672008e98babc225e094292ceb5 (diff) | |
| download | frameworks_av-33142e1e318c0c766a385d88d2434f62f9e2dfe7.zip frameworks_av-33142e1e318c0c766a385d88d2434f62f9e2dfe7.tar.gz frameworks_av-33142e1e318c0c766a385d88d2434f62f9e2dfe7.tar.bz2 | |
Merge "wifi-display: pass session info to wifi display settings" into klp-dev
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/IRemoteDisplayClient.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmedia/IRemoteDisplayClient.cpp b/media/libmedia/IRemoteDisplayClient.cpp index 5c494b3..7190879 100644 --- a/media/libmedia/IRemoteDisplayClient.cpp +++ b/media/libmedia/IRemoteDisplayClient.cpp @@ -38,7 +38,7 @@ public: } void onDisplayConnected(const sp<IGraphicBufferProducer>& bufferProducer, - uint32_t width, uint32_t height, uint32_t flags) + uint32_t width, uint32_t height, uint32_t flags, uint32_t session) { Parcel data, reply; data.writeInterfaceToken(IRemoteDisplayClient::getInterfaceDescriptor()); @@ -46,6 +46,7 @@ public: data.writeInt32(width); data.writeInt32(height); data.writeInt32(flags); + data.writeInt32(session); remote()->transact(ON_DISPLAY_CONNECTED, data, &reply, IBinder::FLAG_ONEWAY); } @@ -80,7 +81,8 @@ status_t BnRemoteDisplayClient::onTransact( uint32_t width = data.readInt32(); uint32_t height = data.readInt32(); uint32_t flags = data.readInt32(); - onDisplayConnected(surfaceTexture, width, height, flags); + uint32_t session = data.readInt32(); + onDisplayConnected(surfaceTexture, width, height, flags, session); return NO_ERROR; } case ON_DISPLAY_DISCONNECTED: { |