Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev (fd600b11) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -493,7 +493,7 @@ aidl_files := \
		frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl \
		frameworks/base/wifi/java/android/net/wifi/WpsInfo.aidl \
		frameworks/base/wifi/java/android/net/wifi/ScanResult.aidl \
		frameworks/base/wifi/java/android/net/wifi/ScanInfo.aidl \
		frameworks/base/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.aidl \
		frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.aidl \
		frameworks/base/wifi/java/android/net/wifi/WifiConfiguration.aidl \
		frameworks/base/wifi/java/android/net/wifi/WifiInfo.aidl \

api/current.txt

+1 −18

Original line number	Diff line number	Diff line
		@@ -19078,22 +19078,6 @@ package android.net.sip {

		package android.net.wifi {

		public class ScanInfo implements android.os.Parcelable {
		ctor public ScanInfo(android.net.wifi.ScanResult);
		ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int);
		method public int describeContents();
		method public long getBssid();
		method public byte[] getIconData();
		method public java.lang.String getIconType();
		method public java.lang.String getName();
		method public int getOsuIdentity();
		method public int getRssi();
		method public android.net.wifi.ScanResult getScanResult();
		method public java.lang.String getServiceDescription();
		method public java.lang.String getSsid();
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class ScanResult implements android.os.Parcelable {
		method public int describeContents();
		method public boolean is80211mcResponder();
		@@ -19254,6 +19238,7 @@ package android.net.wifi {
		field public static final int SIM = 4; // 0x4
		field public static final int TLS = 1; // 0x1
		field public static final int TTLS = 2; // 0x2
		field public static final int UNAUTH_TLS = 7; // 0x7
		}

		public static final class WifiEnterpriseConfig.Phase2 {
		@@ -19296,7 +19281,6 @@ package android.net.wifi {
		method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
		method public android.net.wifi.WifiInfo getConnectionInfo();
		method public android.net.DhcpInfo getDhcpInfo();
		method public java.util.List<android.net.wifi.ScanInfo> getScanInfos();
		method public java.util.List<android.net.wifi.ScanResult> getScanResults();
		method public int getWifiState();
		method public boolean is5GHzBandSupported();
		@@ -19312,7 +19296,6 @@ package android.net.wifi {
		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 setWifiEnabled(boolean);

api/system-current.txt

+1 −18

Original line number	Diff line number	Diff line
		@@ -20832,22 +20832,6 @@ package android.net.wifi {
		field public byte id;
		}

		public class ScanInfo implements android.os.Parcelable {
		ctor public ScanInfo(android.net.wifi.ScanResult);
		ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int);
		method public int describeContents();
		method public long getBssid();
		method public byte[] getIconData();
		method public java.lang.String getIconType();
		method public java.lang.String getName();
		method public int getOsuIdentity();
		method public int getRssi();
		method public android.net.wifi.ScanResult getScanResult();
		method public java.lang.String getServiceDescription();
		method public java.lang.String getSsid();
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class ScanResult implements android.os.Parcelable {
		method public int describeContents();
		method public boolean is80211mcResponder();
		@@ -21030,6 +21014,7 @@ package android.net.wifi {
		field public static final int SIM = 4; // 0x4
		field public static final int TLS = 1; // 0x1
		field public static final int TTLS = 2; // 0x2
		field public static final int UNAUTH_TLS = 7; // 0x7
		}

		public static final class WifiEnterpriseConfig.Phase2 {
		@@ -21075,7 +21060,6 @@ 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 int getWifiState();
		method public boolean is5GHzBandSupported();
		@@ -21095,7 +21079,6 @@ package android.net.wifi {
		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 setWifiEnabled(boolean);

wifi/java/android/net/wifi/AnqpInformationElement.java

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net.wifi;

		/**
		* This object contains the payload of an ANQP element.
		* Vendor id is the vendor ID for the element, or 0 if it is an 802.11(u) element.
		* Hotspot 2.0 uses the WFA Vendor ID which is 0x506f9a
		* The payload contains the bytes of the payload, starting after the length octet(s).
		* @hide
		*/
		public class AnqpInformationElement {
		public static final int HOTSPOT20_VENDOR_ID = 0x506f9a;

		public static final int ANQP_QUERY_LIST = 256;
		public static final int ANQP_CAPABILITY_LIST = 257;
		public static final int ANQP_VENUE_NAME = 258;
		public static final int ANQP_EMERGENCY_NUMBER = 259;
		public static final int ANQP_NWK_AUTH_TYPE = 260;
		public static final int ANQP_ROAMING_CONSORTIUM = 261;
		public static final int ANQP_IP_ADDR_AVAILABILITY = 262;
		public static final int ANQP_NAI_REALM = 263;
		public static final int ANQP_3GPP_NETWORK = 264;
		public static final int ANQP_GEO_LOC = 265;
		public static final int ANQP_CIVIC_LOC = 266;
		public static final int ANQP_LOC_URI = 267;
		public static final int ANQP_DOM_NAME = 268;
		public static final int ANQP_EMERGENCY_ALERT = 269;
		public static final int ANQP_TDLS_CAP = 270;
		public static final int ANQP_EMERGENCY_NAI = 271;
		public static final int ANQP_NEIGHBOR_REPORT = 272;
		public static final int ANQP_VENDOR_SPEC = 56797;

		public static final int HS_QUERY_LIST = 1;
		public static final int HS_CAPABILITY_LIST = 2;
		public static final int HS_FRIENDLY_NAME = 3;
		public static final int HS_WAN_METRICS = 4;
		public static final int HS_CONN_CAPABILITY = 5;
		public static final int HS_NAI_HOME_REALM_QUERY = 6;
		public static final int HS_OPERATING_CLASS = 7;
		public static final int HS_OSU_PROVIDERS = 8;
		public static final int HS_ICON_REQUEST = 10;
		public static final int HS_ICON_FILE = 11;

		private final int mVendorId;
		private final int mElementId;
		private final byte[] mPayload;

		public AnqpInformationElement(int vendorId, int elementId, byte[] payload) {
		mVendorId = vendorId;
		mElementId = elementId;
		mPayload = payload;
		}

		public int getVendorId() {
		return mVendorId;
		}

		public int getElementId() {
		return mElementId;
		}

		public byte[] getPayload() {
		return mPayload;
		}
		}

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

+12 −5

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiInfo;
		import android.net.wifi.ScanSettings;
		import android.net.wifi.ScanResult;
		import android.net.wifi.ScanInfo;
		import android.net.wifi.PasspointManagementObjectDefinition;
		import android.net.wifi.WifiConnectionStatistics;
		import android.net.wifi.WifiActivityEnergyInfo;
		import android.net.Network;
		@@ -50,6 +50,17 @@ interface IWifiManager

		int addOrUpdateNetwork(in WifiConfiguration config);

		int addPasspointManagementObject(String mo);

		int modifyPasspointManagementObject(String fqdn,
		in List<PasspointManagementObjectDefinition> mos);

		void queryPasspointIcon(long bssid, String fileName);

		int matchProviderWithCurrentNetwork(String fqdn);

		void deauthenticateNetwork(long holdoff, boolean ess);

		boolean removeNetwork(int netId);

		boolean enableNetwork(int netId, boolean disableOthers);
		@@ -64,10 +75,6 @@ interface IWifiManager

		void disconnect();

		List<ScanInfo> getScanInfos(String callingPackage);

		void setOsuSelection(int osuID);

		void reconnect();

		void reassociate();