Merge "passpoint-r2: add @systemApi for Passpoint APIs" (37f2ba0a) · Commits · e / os / android_frameworks_base

api/system-current.txt

+63 −0

Original line number	Diff line number	Diff line
		@@ -4144,12 +4144,19 @@ package android.net.wifi {
		field public static final int WPA2_PSK = 4; // 0x4
		}

		public class WifiInfo implements android.os.Parcelable {
		method public boolean isOsuAp();
		}

		public class WifiManager {
		method public void connect(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener);
		method public void connect(int, android.net.wifi.WifiManager.ActionListener);
		method public void disable(int, android.net.wifi.WifiManager.ActionListener);
		method public void disableEphemeralNetwork(java.lang.String);
		method public void forget(int, android.net.wifi.WifiManager.ActionListener);
		method public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration, java.util.Map<java.lang.Integer, java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(java.util.List<android.net.wifi.ScanResult>);
		method public java.util.Map<android.net.wifi.hotspot2.OsuProvider, java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(java.util.List<android.net.wifi.ScanResult>);
		method public java.util.Map<android.net.wifi.hotspot2.OsuProvider, android.net.wifi.hotspot2.PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(java.util.Set<android.net.wifi.hotspot2.OsuProvider>);
		method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
		method public android.net.wifi.WifiConfiguration getWifiApConfiguration();
		method public int getWifiApState();
		@@ -4164,6 +4171,7 @@ package android.net.wifi {
		method public void startEasyConnectAsConfiguratorInitiator(java.lang.String, int, int, android.os.Handler, android.net.wifi.EasyConnectStatusCallback);
		method public void startEasyConnectAsEnrolleeInitiator(java.lang.String, android.os.Handler, android.net.wifi.EasyConnectStatusCallback);
		method public boolean startScan(android.os.WorkSource);
		method public void startSubscriptionProvisioning(android.net.wifi.hotspot2.OsuProvider, android.net.wifi.hotspot2.ProvisioningCallback, android.os.Handler);
		method public void stopEasyConnectSession();
		method public void unregisterNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback);
		field public static final int CHANGE_REASON_ADDED = 0; // 0x0
		@@ -4183,6 +4191,8 @@ package android.net.wifi {
		field public static final java.lang.String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration";
		field public static final java.lang.String EXTRA_WIFI_CREDENTIAL_EVENT_TYPE = "et";
		field public static final java.lang.String EXTRA_WIFI_CREDENTIAL_SSID = "ssid";
		field public static final int PASSPOINT_HOME_NETWORK = 0; // 0x0
		field public static final int PASSPOINT_ROAMING_NETWORK = 1; // 0x1
		field public static final java.lang.String WIFI_AP_STATE_CHANGED_ACTION = "android.net.wifi.WIFI_AP_STATE_CHANGED";
		field public static final int WIFI_AP_STATE_DISABLED = 11; // 0xb
		field public static final int WIFI_AP_STATE_DISABLING = 10; // 0xa
		@@ -4359,6 +4369,59 @@ package android.net.wifi.aware {

		}

		package android.net.wifi.hotspot2 {

		public final class OsuProvider implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.String getFriendlyName();
		method public android.net.Uri getServerUri();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.OsuProvider> CREATOR;
		}

		public abstract class ProvisioningCallback {
		ctor public ProvisioningCallback();
		method public abstract void onProvisioningComplete();
		method public abstract void onProvisioningFailure(int);
		method public abstract void onProvisioningStatus(int);
		field public static final int OSU_FAILURE_ADD_PASSPOINT_CONFIGURATION = 22; // 0x16
		field public static final int OSU_FAILURE_AP_CONNECTION = 1; // 0x1
		field public static final int OSU_FAILURE_INVALID_SERVER_URL = 8; // 0x8
		field public static final int OSU_FAILURE_NO_AAA_SERVER_TRUST_ROOT_NODE = 17; // 0x11
		field public static final int OSU_FAILURE_NO_AAA_TRUST_ROOT_CERTIFICATE = 21; // 0x15
		field public static final int OSU_FAILURE_NO_OSU_ACTIVITY_FOUND = 14; // 0xe
		field public static final int OSU_FAILURE_NO_POLICY_SERVER_TRUST_ROOT_NODE = 19; // 0x13
		field public static final int OSU_FAILURE_NO_PPS_MO = 16; // 0x10
		field public static final int OSU_FAILURE_NO_REMEDIATION_SERVER_TRUST_ROOT_NODE = 18; // 0x12
		field public static final int OSU_FAILURE_OSU_PROVIDER_NOT_FOUND = 23; // 0x17
		field public static final int OSU_FAILURE_PROVISIONING_ABORTED = 6; // 0x6
		field public static final int OSU_FAILURE_PROVISIONING_NOT_AVAILABLE = 7; // 0x7
		field public static final int OSU_FAILURE_RETRIEVE_TRUST_ROOT_CERTIFICATES = 20; // 0x14
		field public static final int OSU_FAILURE_SERVER_CONNECTION = 3; // 0x3
		field public static final int OSU_FAILURE_SERVER_URL_INVALID = 2; // 0x2
		field public static final int OSU_FAILURE_SERVER_VALIDATION = 4; // 0x4
		field public static final int OSU_FAILURE_SERVICE_PROVIDER_VERIFICATION = 5; // 0x5
		field public static final int OSU_FAILURE_SOAP_MESSAGE_EXCHANGE = 11; // 0xb
		field public static final int OSU_FAILURE_START_REDIRECT_LISTENER = 12; // 0xc
		field public static final int OSU_FAILURE_TIMED_OUT_REDIRECT_LISTENER = 13; // 0xd
		field public static final int OSU_FAILURE_UNEXPECTED_COMMAND_TYPE = 9; // 0x9
		field public static final int OSU_FAILURE_UNEXPECTED_SOAP_MESSAGE_STATUS = 15; // 0xf
		field public static final int OSU_FAILURE_UNEXPECTED_SOAP_MESSAGE_TYPE = 10; // 0xa
		field public static final int OSU_STATUS_AP_CONNECTED = 2; // 0x2
		field public static final int OSU_STATUS_AP_CONNECTING = 1; // 0x1
		field public static final int OSU_STATUS_INIT_SOAP_EXCHANGE = 6; // 0x6
		field public static final int OSU_STATUS_REDIRECT_RESPONSE_RECEIVED = 8; // 0x8
		field public static final int OSU_STATUS_RETRIEVING_TRUST_ROOT_CERTS = 11; // 0xb
		field public static final int OSU_STATUS_SECOND_SOAP_EXCHANGE = 9; // 0x9
		field public static final int OSU_STATUS_SERVER_CONNECTED = 5; // 0x5
		field public static final int OSU_STATUS_SERVER_CONNECTING = 3; // 0x3
		field public static final int OSU_STATUS_SERVER_VALIDATED = 4; // 0x4
		field public static final int OSU_STATUS_THIRD_SOAP_EXCHANGE = 10; // 0xa
		field public static final int OSU_STATUS_WAITING_FOR_REDIRECT_RESPONSE = 7; // 0x7
		}

		}

		package android.net.wifi.rtt {

		public static final class RangingRequest.Builder {

wifi/java/android/net/wifi/WifiInfo.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.net.wifi;

		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.net.NetworkInfo.DetailedState;
		import android.net.NetworkUtils;
		@@ -470,6 +471,7 @@ public class WifiInfo implements Parcelable {
		}

		/** {@hide} */
		@SystemApi
		public boolean isOsuAp() {
		return mOsuAp;
		}

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

+22 −3

Original line number	Diff line number	Diff line
		@@ -236,9 +236,11 @@ public class WifiManager {
		public static final int WIFI_CREDENTIAL_FORGOT = 1;

		/** @hide */
		@SystemApi
		public static final int PASSPOINT_HOME_NETWORK = 0;

		/** @hide */
		@SystemApi
		public static final int PASSPOINT_ROAMING_NETWORK = 1;

		/**
		@@ -1219,7 +1221,11 @@ public class WifiManager {
		* @throws UnsupportedOperationException if Passpoint is not enabled on the device.
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
		@SystemApi
		@RequiresPermission(anyOf = {
		android.Manifest.permission.NETWORK_SETTINGS,
		android.Manifest.permission.NETWORK_SETUP_WIZARD
		})
		public List<Pair<WifiConfiguration, Map<Integer, List<ScanResult>>>> getAllMatchingWifiConfigs(
		@NonNull List<ScanResult> scanResults) {
		List<Pair<WifiConfiguration, Map<Integer, List<ScanResult>>>> configs = new ArrayList<>();
		@@ -1258,7 +1264,11 @@ public class WifiManager {
		* @throws UnsupportedOperationException if Passpoint is not enabled on the device.
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
		@SystemApi
		@RequiresPermission(anyOf = {
		android.Manifest.permission.NETWORK_SETTINGS,
		android.Manifest.permission.NETWORK_SETUP_WIZARD
		})
		public Map<OsuProvider, List<ScanResult>> getMatchingOsuProviders(
		List<ScanResult> scanResults) {
		try {
		@@ -1281,7 +1291,11 @@ public class WifiManager {
		* @throws UnsupportedOperationException if Passpoint is not enabled on the device.
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
		@SystemApi
		@RequiresPermission(anyOf = {
		android.Manifest.permission.NETWORK_SETTINGS,
		android.Manifest.permission.NETWORK_SETUP_WIZARD
		})
		public Map<OsuProvider, PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(
		@NonNull Set<OsuProvider> osuProviders) {
		try {
		@@ -4335,6 +4349,11 @@ public class WifiManager {
		* @param callback {@link ProvisioningCallback} for updates regarding provisioning flow
		* @hide
		*/
		@SystemApi
		@RequiresPermission(anyOf = {
		android.Manifest.permission.NETWORK_SETTINGS,
		android.Manifest.permission.NETWORK_SETUP_WIZARD
		})
		public void startSubscriptionProvisioning(OsuProvider provider, ProvisioningCallback callback,
		@Nullable Handler handler) {
		Looper looper = (handler == null) ? Looper.getMainLooper() : handler.getLooper();

wifi/java/android/net/wifi/hotspot2/OsuProvider.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.net.wifi.hotspot2;

		import android.annotation.SystemApi;
		import android.graphics.drawable.Icon;
		import android.net.Uri;
		import android.net.wifi.WifiSsid;
		@@ -36,16 +37,19 @@ import java.util.Objects;
		*
		* @hide
		*/
		@SystemApi
		public final class OsuProvider implements Parcelable {
		/**
		* OSU (Online Sign-Up) method: OMA DM (Open Mobile Alliance Device Management).
		* For more info, refer to Section 8.3 of the Hotspot 2.0 Release 2 Technical Specification.
		* @hide
		*/
		public static final int METHOD_OMA_DM = 0;

		/**
		* OSU (Online Sign-Up) method: SOAP XML SPP (Subscription Provisioning Protocol).
		* For more info, refer to Section 8.4 of the Hotspot 2.0 Release 2 Technical Specification.
		* @hide
		*/
		public static final int METHOD_SOAP_XML_SPP = 1;

		@@ -84,6 +88,7 @@ public final class OsuProvider implements Parcelable {
		*/
		private final Icon mIcon;

		/** @hide */
		public OsuProvider(WifiSsid osuSsid, Map<String, String> friendlyNames,
		String serviceDescription, Uri serverUri, String nai, List<Integer> methodList,
		Icon icon) {
		@@ -104,6 +109,7 @@ public final class OsuProvider implements Parcelable {
		* Copy constructor.
		*
		* @param source The source to copy from
		* @hide
		*/
		public OsuProvider(OsuProvider source) {
		if (source == null) {
		@@ -130,10 +136,12 @@ public final class OsuProvider implements Parcelable {
		mIcon = source.mIcon;
		}

		/** @hide */
		public WifiSsid getOsuSsid() {
		return mOsuSsid;
		}

		/** @hide */
		public void setOsuSsid(WifiSsid osuSsid) {
		mOsuSsid = osuSsid;
		}
		@@ -162,10 +170,12 @@ public final class OsuProvider implements Parcelable {
		return mFriendlyNames.get(mFriendlyNames.keySet().stream().findFirst().get());
		}

		/** @hide */
		public Map<String, String> getFriendlyNameList() {
		return mFriendlyNames;
		}

		/** @hide */
		public String getServiceDescription() {
		return mServiceDescription;
		}
		@@ -174,14 +184,17 @@ public final class OsuProvider implements Parcelable {
		return mServerUri;
		}

		/** @hide */
		public String getNetworkAccessIdentifier() {
		return mNetworkAccessIdentifier;
		}

		/** @hide */
		public List<Integer> getMethodList() {
		return mMethodList;
		}

		/** @hide */
		public Icon getIcon() {
		return mIcon;
		}

wifi/java/android/net/wifi/hotspot2/ProvisioningCallback.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.net.wifi.hotspot2;

		import android.annotation.SystemApi;
		import android.net.wifi.WifiManager;
		import android.os.Handler;

		@@ -25,6 +26,7 @@ import android.os.Handler;
		*
		* @hide
		*/
		@SystemApi
		public abstract class ProvisioningCallback {

		/**