diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-09 00:22:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-09 00:22:43 -0700 |
| commit | df00fc2d9ac02cde6df75b76a93929396a1f696b (patch) | |
| tree | dacb7de5f5f683a1c33fed69f6e78b9cb90e5b44 /media/libmediaplayerservice | |
| parent | e3ec64cb66dc85c29f525350e48750ec09686007 (diff) | |
| parent | b019250df516e094b0cb648851f9a132b045378a (diff) | |
| download | frameworks_av-df00fc2d9ac02cde6df75b76a93929396a1f696b.zip frameworks_av-df00fc2d9ac02cde6df75b76a93929396a1f696b.tar.gz frameworks_av-df00fc2d9ac02cde6df75b76a93929396a1f696b.tar.bz2 | |
am b019250d: Add a permission for controlling wifi display.
* commit 'b019250df516e094b0cb648851f9a132b045378a':
Add a permission for controlling wifi display.
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 6b57c48..1be4edf 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -283,10 +283,19 @@ sp<ICrypto> MediaPlayerService::makeCrypto() { sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay( const sp<IRemoteDisplayClient>& client, const String8& iface) { + if (!checkPermission("android.permission.CONTROL_WIFI_DISPLAY")) { + return NULL; + } + return new RemoteDisplay(client, iface.string()); } +// TODO: delete this method status_t MediaPlayerService::enableRemoteDisplay(const char *iface) { + if (!checkPermission("android.permission.CONTROL_WIFI_DISPLAY")) { + return PERMISSION_DENIED; + } + Mutex::Autolock autoLock(mLock); if (iface != NULL) { |