Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34e39c3f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 20d03953 fedd6165

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class BaseWifiService extends IWifiManager.Stub { 
    }



    @Override

    public List<PasspointConfiguration> getPasspointConfigurations() {

    public List<PasspointConfiguration> getPasspointConfigurations(String packageName) {

        throw new UnsupportedOperationException();

    }