commit 54c6667b37f936159b49b5b0ed9ef8dd8e5f5615
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 04 09:49:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 04 09:49:44 2017 +0000
tree 24bbcde3383ddf4a4945466c34a45fcf8b41ad1b
parent 7b16a3c64a786998914dcd8552fa5cc6879e4e36
parent c55e27a5cd6d3bef1e9914ae74eaf66328949dc4

Merge "getConnectionInfo should take calling package name as argument" into oc-mr1-dev

wifi/java/android/net/wifi/IWifiManager.aidl

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 7972d06..a3a1054 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -94,7 +94,7 @@
 
     void reassociate();
 
-    WifiInfo getConnectionInfo();
+    WifiInfo getConnectionInfo(String callingPackage);
 
     boolean setWifiEnabled(String packageName, boolean enable);
 

wifi/java/android/net/wifi/WifiManager.java

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index c499edc..bc37810 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1643,7 +1643,7 @@
      */
     public WifiInfo getConnectionInfo() {
         try {
-            return mService.getConnectionInfo();
+            return mService.getConnectionInfo(mContext.getOpPackageName());
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }