summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2013-08-26 15:17:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-26 15:17:52 -0700
commit733ba4dc9161741930464818618855962bdb1297 (patch)
tree452c736e2277c5955b071d1c114114d1bb1e09f2 /include/media
parent6e74cc78e3e16686b895958d2a623abc3f5a775f (diff)
parentf79d6e44ffd427cf9d331a95777cfbbcc99f72f1 (diff)
downloadframeworks_av-733ba4dc9161741930464818618855962bdb1297.zip
frameworks_av-733ba4dc9161741930464818618855962bdb1297.tar.gz
frameworks_av-733ba4dc9161741930464818618855962bdb1297.tar.bz2
am f79d6e44: am 33142e1e: Merge "wifi-display: pass session info to wifi display settings" into klp-dev
* commit 'f79d6e44ffd427cf9d331a95777cfbbcc99f72f1': wifi-display: pass session info to wifi display settings
Diffstat (limited to 'include/media')
-rw-r--r--include/media/IRemoteDisplayClient.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/IRemoteDisplayClient.h b/include/media/IRemoteDisplayClient.h
index 7b0fa9e..0e6d55d 100644
--- a/include/media/IRemoteDisplayClient.h
+++ b/include/media/IRemoteDisplayClient.h
@@ -49,7 +49,7 @@ public:
// Provides a surface texture that the client should use to stream buffers to
// the remote display.
virtual void onDisplayConnected(const sp<IGraphicBufferProducer>& bufferProducer,
- uint32_t width, uint32_t height, uint32_t flags) = 0; // one-way
+ uint32_t width, uint32_t height, uint32_t flags, uint32_t session) = 0; // one-way
// Indicates that the remote display has been disconnected normally.
// This method should only be called once the client has called 'dispose()'