summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-11-29 14:32:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-29 14:32:21 -0800
commitf59ab0eb162cc32df4fc0af8d1a4500c5bce3ecc (patch)
tree6851003e7af892906473b96685a03767068b6168 /media/libmediaplayerservice
parent4aefd5fc4dde13a8f3c9c27ec4055b771c0ee341 (diff)
parent53faa7ee457eb9b27be1fd814e42ffe43c8520a0 (diff)
downloadframeworks_av-f59ab0eb162cc32df4fc0af8d1a4500c5bce3ecc.zip
frameworks_av-f59ab0eb162cc32df4fc0af8d1a4500c5bce3ecc.tar.gz
frameworks_av-f59ab0eb162cc32df4fc0af8d1a4500c5bce3ecc.tar.bz2
am 2f6107ec: am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev
* commit '2f6107ec8e67eea1f73b9558a5ad34caec52867f': [wfd] Support a low(er) power state by triggering PAUSE/RESUME.
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/RemoteDisplay.cpp8
-rw-r--r--media/libmediaplayerservice/RemoteDisplay.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/RemoteDisplay.cpp b/media/libmediaplayerservice/RemoteDisplay.cpp
index 5baa3ad..20e6513 100644
--- a/media/libmediaplayerservice/RemoteDisplay.cpp
+++ b/media/libmediaplayerservice/RemoteDisplay.cpp
@@ -40,6 +40,14 @@ RemoteDisplay::RemoteDisplay(
RemoteDisplay::~RemoteDisplay() {
}
+status_t RemoteDisplay::pause() {
+ return mSource->pause();
+}
+
+status_t RemoteDisplay::resume() {
+ return mSource->resume();
+}
+
status_t RemoteDisplay::dispose() {
mSource->stop();
diff --git a/media/libmediaplayerservice/RemoteDisplay.h b/media/libmediaplayerservice/RemoteDisplay.h
index 0d87250..bd8b684 100644
--- a/media/libmediaplayerservice/RemoteDisplay.h
+++ b/media/libmediaplayerservice/RemoteDisplay.h
@@ -33,6 +33,8 @@ struct WifiDisplaySource;
struct RemoteDisplay : public BnRemoteDisplay {
RemoteDisplay(const sp<IRemoteDisplayClient> &client, const char *iface);
+ virtual status_t pause();
+ virtual status_t resume();
virtual status_t dispose();
protected: