Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 34e39c3f2a

Change-Id: I17eef818fc4191c61ab33cbf151600a8266292b1
This commit is contained in:
Ecco Park
2019-04-11 19:10:35 -07:00
committed by android-build-merger
parent 24dcdc9d26 34e39c3f2a
commit cb64db586b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/IWifiManager.aidl
View File

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

2
wifi/java/android/net/wifi/WifiManager.java
View File

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

2
wifi/java/com/android/server/wifi/BaseWifiService.java
View File

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