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

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

Merge "passpoint-r2: change return type of getMatchingOsuProviders"

parents c48a8a4b d23fedb0

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ interface IWifiManager 


    Map getAllMatchingFqdnsForScanResults(in List<ScanResult> scanResult);



    List<OsuProvider> getMatchingOsuProviders(in List<ScanResult> scanResult);

    Map getMatchingOsuProviders(in List<ScanResult> scanResult);



    Map getMatchingPasspointConfigsForOsuProviders(in List<OsuProvider> osuProviders);

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

+3 −2
Original line number Diff line number Diff line
@@ -1234,12 +1234,13 @@ public class WifiManager { 
     * An empty list will be returned if no match is found.

     *

     * @param scanResults a list of ScanResult

     * @return A list of {@link OsuProvider} that does not contain duplicate entries.

     * @return Map that consists {@link OsuProvider} and a list of matching {@link ScanResult}

     * @throws UnsupportedOperationException if Passpoint is not enabled on the device.

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    public List<OsuProvider> getMatchingOsuProviders(List<ScanResult> scanResults) {

    public Map<OsuProvider, List<ScanResult>> getMatchingOsuProviders(

            List<ScanResult> scanResults) {

        try {

            return mService.getMatchingOsuProviders(scanResults);

        } catch (RemoteException e) {

wifi/java/com/android/server/wifi/AbstractWifiService.java

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



    @Override

    public List<OsuProvider> getMatchingOsuProviders(List<ScanResult> scanResults) {

    public Map<OsuProvider, List<ScanResult>> getMatchingOsuProviders(

            List<ScanResult> scanResults) {

        throw new UnsupportedOperationException();

    }