summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/RemoteDisplay.cpp
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.cpp
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.cpp')
-rw-r--r--media/libmediaplayerservice/RemoteDisplay.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/RemoteDisplay.cpp b/media/libmediaplayerservice/RemoteDisplay.cpp
index 1cc605e..5542bb5 100644
--- a/media/libmediaplayerservice/RemoteDisplay.cpp
+++ b/media/libmediaplayerservice/RemoteDisplay.cpp
@@ -39,7 +39,7 @@ RemoteDisplay::RemoteDisplay(
RemoteDisplay::~RemoteDisplay() {
}
-status_t RemoteDisplay::disconnect() {
+status_t RemoteDisplay::dispose() {
mSource->stop();
mLooper->stop();