diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-10 17:10:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-10 17:10:35 -0700 |
| commit | 30482ff979f543cccd8717a707d1d6b7ec0312c0 (patch) | |
| tree | d9a593b3809c9b83136406be8121976c0d840bae /media | |
| parent | 0ace93f451bf5213bfe546d47c7878317681e27d (diff) | |
| parent | df00fc2d9ac02cde6df75b76a93929396a1f696b (diff) | |
| download | frameworks_av-30482ff979f543cccd8717a707d1d6b7ec0312c0.zip frameworks_av-30482ff979f543cccd8717a707d1d6b7ec0312c0.tar.gz frameworks_av-30482ff979f543cccd8717a707d1d6b7ec0312c0.tar.bz2 | |
am df00fc2d: am b019250d: Add a permission for controlling wifi display.
* commit 'df00fc2d9ac02cde6df75b76a93929396a1f696b':
Add a permission for controlling wifi display.
Diffstat (limited to 'media')
| -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) { |