summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-10-01 14:58:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-01 14:58:53 -0700
commitc0256c71182ed9c028e9f5078b64828b8e01f199 (patch)
tree842c539a06fb30d1f413ee709880f1d7696f0c39
parentbae1162c506b7356bd2486331e5eb1425071a75a (diff)
parent0cb47712a4fc0e01ad8680ee6ac3a5d72eafe0ba (diff)
downloadframeworks_av-c0256c71182ed9c028e9f5078b64828b8e01f199.zip
frameworks_av-c0256c71182ed9c028e9f5078b64828b8e01f199.tar.gz
frameworks_av-c0256c71182ed9c028e9f5078b64828b8e01f199.tar.bz2
am 0cb47712: Inform DisplayManager that we\'re running over a secure channel (HDCP)
* commit '0cb47712a4fc0e01ad8680ee6ac3a5d72eafe0ba': Inform DisplayManager that we're running over a secure channel (HDCP)
-rw-r--r--media/libstagefright/wifi-display/source/WifiDisplaySource.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
index adb1549..4c2b457 100644
--- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
+++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
@@ -312,7 +312,12 @@ void WifiDisplaySource::onMessageReceived(const sp<AMessage> &msg) {
mClientInfo.mPlaybackSession->getSurfaceTexture(),
mClientInfo.mPlaybackSession->width(),
mClientInfo.mPlaybackSession->height(),
- 0 /* flags */);
+#if REQUIRE_HDCP
+ IRemoteDisplayClient::kDisplayFlagSecure
+#else
+ 0 /* flags */
+#endif
+ );
}
if (mState == ABOUT_TO_PLAY) {