Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev

am: fd600b1113

* commit 'fd600b1113af6f66e28b65f5b53f4a7c751cdef9':
  New System APIs for Passpoint r2 app.

diff --cc Android.mk
Simple merge

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
index e4c9fc8,a8671d4..8231d4f
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -26633,10 -21060,7 +26618,9 @@@ package android.net.wifi 
      method public android.net.wifi.WifiConnectionStatistics getConnectionStatistics();
      method public android.net.DhcpInfo getDhcpInfo();
      method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
-     method public java.util.List<android.net.wifi.ScanInfo> getScanInfos();
      method public java.util.List<android.net.wifi.ScanResult> getScanResults();
 +    method public android.net.wifi.WifiConfiguration getWifiApConfiguration();
 +    method public int getWifiApState();
      method public int getWifiState();
      method public boolean is5GHzBandSupported();
      method public deprecated boolean isBatchedScanSupported();
@@@ -26656,11 -21079,8 +26640,10 @@@
      method public boolean reconnect();
      method public boolean removeNetwork(int);
      method public boolean saveConfiguration();
-     method public void setOsuSelection(int);
      method public void setTdlsEnabled(java.net.InetAddress, boolean);
      method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
 +    method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
 +    method public boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);
      method public boolean setWifiEnabled(boolean);
      method public deprecated boolean startLocationRestrictedScan(android.os.WorkSource);
      method public boolean startScan();

diff --cc wifi/java/android/net/wifi/WifiConfiguration.java
index 4c22460,c8065f9..a9132a5
--- 1/wifi/java/android/net/wifi/WifiConfiguration.java
--- 2/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@@ -78,8 -81,12 +81,13 @@@ public class WifiConfiguration implemen
            * (requires {@code preSharedKey} to be specified).
            * @hide
            */
 +        @SystemApi
          public static final int WPA2_PSK = 4;
+         /**
+          * Hotspot 2.0 r2 OSEN:
+          * @hide
+          */
+         public static final int OSEN = 5;
  
          public static final String varName = "key_mgmt";
  

diff --cc wifi/java/android/net/wifi/WifiEnterpriseConfig.java
Simple merge

diff --cc wifi/java/android/net/wifi/WifiManager.java
Simple merge