summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-11-29 14:27:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-29 14:27:59 -0800
commit53faa7ee457eb9b27be1fd814e42ffe43c8520a0 (patch)
tree121339964fd8d4cb89e4d0ba0fafc801972f1290 /media/libmediaplayerservice
parent6b4f9facb1d0caf06d511bd1d5a020c6af793c2b (diff)
parent471dd1323f832a2b7daf42f7e75d2b4471dfe112 (diff)
downloadframeworks_av-53faa7ee457eb9b27be1fd814e42ffe43c8520a0.zip
frameworks_av-53faa7ee457eb9b27be1fd814e42ffe43c8520a0.tar.gz
frameworks_av-53faa7ee457eb9b27be1fd814e42ffe43c8520a0.tar.bz2
am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev
* commit 'b64def9a555bfbf533a2da41ba0189b9842a76fb': [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: