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

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

Browse Source
This commit is contained in:
Pankaj Kanwar
2016-12-22 17:59:08 +00:00
committed by Android (Google) Code Review
parent 1fc63da0e5 9f47a5d85e
commit 683dbf1fc6
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,8 @@ interface IWifiManager
List<WifiConfiguration> getConfiguredNetworks(); List<WifiConfiguration> getConfiguredNetworks();
boolean hasCarrierConfiguredNetworks();
List<WifiConfiguration> getPrivilegedConfiguredNetworks(); List<WifiConfiguration> getPrivilegedConfiguredNetworks();
WifiConfiguration getMatchingWifiConfig(in ScanResult scanResult); WifiConfiguration getMatchingWifiConfig(in ScanResult scanResult);

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

@@ -746,6 +746,15 @@ public class WifiManager {
} }
} }
/** @hide */
public boolean hasCarrierConfiguredNetworks() {
try {
return mService.hasCarrierConfiguredNetworks();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/** @hide */ /** @hide */
@SystemApi @SystemApi
public List<WifiConfiguration> getPrivilegedConfiguredNetworks() { public List<WifiConfiguration> getPrivilegedConfiguredNetworks() {