commit b4663456d4b4a40c251e359078d00b2d6a97ac4c
author Sohani Rao <sohanirao@google.com> Mon Nov 14 19:44:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 14 19:44:46 2016 +0000
tree b45f487b77e679da345fe31c9386a3fa2caf13f0
parent 9e976c8565b573fa83bd61d160b2c5981d69a863
parent 7342bb84cdb4a68378512cabbc8f005f0ca063b9

Merge "Permissions check for Wifi Display configuration" am: f5c32a411c
am: 7342bb84cd

Change-Id: Iac379dace6fd8b01e5bb80a193f79c65ace1f9b9

wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl

diff --git a/wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl b/wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl
index ee2e895..8b1cfae 100644
--- a/wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl
+++ b/wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl
@@ -28,5 +28,6 @@
     Messenger getMessenger();
     Messenger getP2pStateMachineMessenger();
     void setMiracastMode(int mode);
+    void checkConfigureWifiDisplayPermission();
 }
 

wifi/java/android/net/wifi/p2p/WifiP2pManager.java

diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java
index 398308d..c93ac7b 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java
@@ -1324,6 +1324,11 @@
             Channel c, WifiP2pWfdInfo wfdInfo,
             ActionListener listener) {
         checkChannel(c);
+        try {
+            mService.checkConfigureWifiDisplayPermission();
+        } catch (RemoteException e) {
+            e.rethrowFromSystemServer();
+        }
         c.mAsyncChannel.sendMessage(SET_WFD_INFO, 0, c.putListener(listener), wfdInfo);
     }