commit 30482ff979f543cccd8717a707d1d6b7ec0312c0
author Jeff Brown <jeffbrown@google.com> Mon Sep 10 17:10:35 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 10 17:10:35 2012 -0700
tree d9a593b3809c9b83136406be8121976c0d840bae
parent 0ace93f451bf5213bfe546d47c7878317681e27d
parent df00fc2d9ac02cde6df75b76a93929396a1f696b

am df00fc2d: am b019250d: Add a permission for controlling wifi display.

* commit 'df00fc2d9ac02cde6df75b76a93929396a1f696b':
  Add a permission for controlling wifi display.

media/libmediaplayerservice/MediaPlayerService.cpp

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<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) {