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

Commit 683dbf1f authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev

parents 1fc63da0 9f47a5d8

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

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ interface IWifiManager 


    List<WifiConfiguration> getConfiguredNetworks();



    boolean hasCarrierConfiguredNetworks();



    List<WifiConfiguration> getPrivilegedConfiguredNetworks();



    WifiConfiguration getMatchingWifiConfig(in ScanResult scanResult);

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

+9 −0
Original line number Diff line number Diff line
@@ -746,6 +746,15 @@ public class WifiManager { 
        }

    }



    /** @hide */

    public boolean hasCarrierConfiguredNetworks() {

        try {

            return mService.hasCarrierConfiguredNetworks();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /** @hide */

    @SystemApi

    public List<WifiConfiguration> getPrivilegedConfiguredNetworks() {