summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/RemoteDisplay.h
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-09-06 10:18:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 10:18:42 -0700
commitb9c760d673dc3f3f3086a84f21d79949876c0345 (patch)
tree45689027adbe3ab133f801e24222ccd5ca8d8e61 /media/libmediaplayerservice/RemoteDisplay.h
parentcf48d5595b362635f3bda05089247ee5cda9a3ad (diff)
parent3e295bd23c7dc4c94960f32465576cee62148d14 (diff)
downloadframeworks_av-b9c760d673dc3f3f3086a84f21d79949876c0345.zip
frameworks_av-b9c760d673dc3f3f3086a84f21d79949876c0345.tar.gz
frameworks_av-b9c760d673dc3f3f3086a84f21d79949876c0345.tar.bz2
am 3e295bd2: am 49c74da1: Merge "Update remote display API." into jb-mr1-dev
* commit '3e295bd23c7dc4c94960f32465576cee62148d14': Update remote display API.
Diffstat (limited to 'media/libmediaplayerservice/RemoteDisplay.h')
-rw-r--r--media/libmediaplayerservice/RemoteDisplay.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/RemoteDisplay.h b/media/libmediaplayerservice/RemoteDisplay.h
index 63c5286..0d87250 100644
--- a/media/libmediaplayerservice/RemoteDisplay.h
+++ b/media/libmediaplayerservice/RemoteDisplay.h
@@ -33,7 +33,7 @@ struct WifiDisplaySource;
struct RemoteDisplay : public BnRemoteDisplay {
RemoteDisplay(const sp<IRemoteDisplayClient> &client, const char *iface);
- virtual status_t disconnect();
+ virtual status_t dispose();
protected:
virtual ~RemoteDisplay();