Revert "stagefright: remove Miracast sender code"
This reverts commit d0a98fa05f0f6719b93d000c4638230af06e0b99.
fixup! Revert "stagefright: remove Miracast sender code"
Change-Id: Ia6948e6c6d71f437fa118185a9df8bcd4ce47575
Change-Id: I0554b92c290c1ebbd1a40fc2edb43573a97d4f6a
Signed-off-by: DennySPb <dennyspb@gmail.com>
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 0067344..ee37b71 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -84,6 +84,8 @@
#include "TestPlayerStub.h"
#include <nuplayer/NuPlayerDriver.h>
+#include "HDCP.h"
+#include "RemoteDisplay.h"
static const int kDumpLockRetries = 50;
static const int kDumpLockSleepUs = 20000;
@@ -523,13 +525,18 @@
return MediaCodecList::getLocalInstance();
}
-sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay(
- const String16 &/*opPackageName*/,
- const sp<IRemoteDisplayClient>& /*client*/,
- const String8& /*iface*/) {
- ALOGE("listenForRemoteDisplay is no longer supported!");
+sp<IHDCP> MediaPlayerService::makeHDCP(bool createEncryptionModule) {
+ return new HDCP(createEncryptionModule);
+}
- return NULL;
+sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay(
+ const String16 &opPackageName,
+ const sp<IRemoteDisplayClient>& client, const String8& iface) {
+ if (!checkPermission("android.permission.CONTROL_WIFI_DISPLAY")) {
+ return NULL;
+ }
+
+ return new RemoteDisplay(opPackageName, client, iface.c_str());
}
status_t MediaPlayerService::AudioOutput::dump(int fd, const Vector<String16>& args) const