Merge "Pass the package of caller to getPasspointConfigurations into WifiService" into qt-dev

am: 34e39c3f2a

Change-Id: I17eef818fc4191c61ab33cbf151600a8266292b1

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

@@ -75,7 +75,7 @@ interface IWifiManager
 
     boolean removePasspointConfiguration(in String fqdn, String packageName);
 
-    List<PasspointConfiguration> getPasspointConfigurations();
+    List<PasspointConfiguration> getPasspointConfigurations(in String packageName);
 
     List<WifiConfiguration> getWifiConfigsForPasspointProfiles(in List<String> fqdnList);
 

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

@@ -1778,7 +1778,7 @@ public class WifiManager {
     })
     public List<PasspointConfiguration> getPasspointConfigurations() {
         try {
-            return mService.getPasspointConfigurations();
+            return mService.getPasspointConfigurations(mContext.getOpPackageName());
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }

wifi/java/com/android/server/wifi/BaseWifiService.java

@@ -124,7 +124,7 @@ public class BaseWifiService extends IWifiManager.Stub {
     }
 
     @Override
-    public List<PasspointConfiguration> getPasspointConfigurations() {
+    public List<PasspointConfiguration> getPasspointConfigurations(String packageName) {
         throw new UnsupportedOperationException();
     }