Merge "[DPP] Rename "DPP" public API to "Easy Connect"" (e49bb322) · Commits · e / os / android_frameworks_base

api/system-current.txt

+19 −19

Original line number	Diff line number	Diff line
		@@ -3908,24 +3908,24 @@ package android.net {

		package android.net.wifi {

		public abstract class DppStatusCallback {
		ctor public DppStatusCallback();
		public abstract class EasyConnectStatusCallback {
		ctor public EasyConnectStatusCallback();
		method public abstract void onConfiguratorSuccess(int);
		method public abstract void onEnrolleeSuccess(int);
		method public abstract void onFailure(int);
		method public abstract void onProgress(int);
		field public static final int DPP_EVENT_FAILURE = -7; // 0xfffffff9
		field public static final int DPP_EVENT_FAILURE_AUTHENTICATION = -2; // 0xfffffffe
		field public static final int DPP_EVENT_FAILURE_BUSY = -5; // 0xfffffffb
		field public static final int DPP_EVENT_FAILURE_CONFIGURATION = -4; // 0xfffffffc
		field public static final int DPP_EVENT_FAILURE_INVALID_NETWORK = -9; // 0xfffffff7
		field public static final int DPP_EVENT_FAILURE_INVALID_URI = -1; // 0xffffffff
		field public static final int DPP_EVENT_FAILURE_NOT_COMPATIBLE = -3; // 0xfffffffd
		field public static final int DPP_EVENT_FAILURE_NOT_SUPPORTED = -8; // 0xfffffff8
		field public static final int DPP_EVENT_FAILURE_TIMEOUT = -6; // 0xfffffffa
		field public static final int DPP_EVENT_PROGRESS_AUTHENTICATION_SUCCESS = 0; // 0x0
		field public static final int DPP_EVENT_PROGRESS_RESPONSE_PENDING = 1; // 0x1
		field public static final int DPP_EVENT_SUCCESS_CONFIGURATION_SENT = 0; // 0x0
		field public static final int EASY_CONNECT_EVENT_FAILURE = -7; // 0xfffffff9
		field public static final int EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION = -2; // 0xfffffffe
		field public static final int EASY_CONNECT_EVENT_FAILURE_BUSY = -5; // 0xfffffffb
		field public static final int EASY_CONNECT_EVENT_FAILURE_CONFIGURATION = -4; // 0xfffffffc
		field public static final int EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK = -9; // 0xfffffff7
		field public static final int EASY_CONNECT_EVENT_FAILURE_INVALID_URI = -1; // 0xffffffff
		field public static final int EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE = -3; // 0xfffffffd
		field public static final int EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED = -8; // 0xfffffff8
		field public static final int EASY_CONNECT_EVENT_FAILURE_TIMEOUT = -6; // 0xfffffffa
		field public static final int EASY_CONNECT_EVENT_PROGRESS_AUTHENTICATION_SUCCESS = 0; // 0x0
		field public static final int EASY_CONNECT_EVENT_PROGRESS_RESPONSE_PENDING = 1; // 0x1
		field public static final int EASY_CONNECT_EVENT_SUCCESS_CONFIGURATION_SENT = 0; // 0x0
		}

		public deprecated class RttManager {
		@@ -4156,10 +4156,10 @@ package android.net.wifi {
		method public void save(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener);
		method public void setDeviceMobilityState(int);
		method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
		method public void startDppAsConfiguratorInitiator(java.lang.String, int, int, android.os.Handler, android.net.wifi.DppStatusCallback);
		method public void startDppAsEnrolleeInitiator(java.lang.String, android.os.Handler, android.net.wifi.DppStatusCallback);
		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 stopDppSession();
		method public void stopEasyConnectSession();
		method public void unregisterNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback);
		field public static final int CHANGE_REASON_ADDED = 0; // 0x0
		field public static final int CHANGE_REASON_CONFIG_CHANGE = 2; // 0x2
		@@ -4169,8 +4169,8 @@ package android.net.wifi {
		field public static final int DEVICE_MOBILITY_STATE_LOW_MVMT = 2; // 0x2
		field public static final int DEVICE_MOBILITY_STATE_STATIONARY = 3; // 0x3
		field public static final int DEVICE_MOBILITY_STATE_UNKNOWN = 0; // 0x0
		field public static final int DPP_NETWORK_ROLE_AP = 1; // 0x1
		field public static final int DPP_NETWORK_ROLE_STA = 0; // 0x0
		field public static final int EASY_CONNECT_NETWORK_ROLE_AP = 1; // 0x1
		field public static final int EASY_CONNECT_NETWORK_ROLE_STA = 0; // 0x0
		field public static final java.lang.String EXTRA_CHANGE_REASON = "changeReason";
		field public static final java.lang.String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";
		field public static final java.lang.String EXTRA_PREVIOUS_WIFI_AP_STATE = "previous_wifi_state";

wifi/java/android/net/wifi/DppStatusCallback.java

deleted100644 → 0

+0 −166

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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;

		import android.annotation.IntDef;
		import android.annotation.SystemApi;
		import android.os.Handler;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* DPP Status Callback. Use this callback to get status updates (success, failure, progress)
		* from the DPP operation started with {@link WifiManager#startDppAsConfiguratorInitiator(String,
		* int, int, Handler, DppStatusCallback)} or {@link WifiManager#startDppAsEnrolleeInitiator(String,
		* Handler, DppStatusCallback)}
		* @hide
		*/
		@SystemApi
		public abstract class DppStatusCallback {
		/**
		* DPP Success event: Configuration sent (Configurator mode).
		*/
		public static final int DPP_EVENT_SUCCESS_CONFIGURATION_SENT = 0;

		/** @hide */
		@IntDef(prefix = { "DPP_EVENT_SUCCESS_" }, value = {
		DPP_EVENT_SUCCESS_CONFIGURATION_SENT,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface DppSuccessStatusCode {}

		/**
		* DPP Progress event: Initial authentication with peer succeeded.
		*/
		public static final int DPP_EVENT_PROGRESS_AUTHENTICATION_SUCCESS = 0;

		/**
		* DPP Progress event: Peer requires more time to process bootstrapping.
		*/
		public static final int DPP_EVENT_PROGRESS_RESPONSE_PENDING = 1;

		/** @hide */
		@IntDef(prefix = { "DPP_EVENT_PROGRESS_" }, value = {
		DPP_EVENT_PROGRESS_AUTHENTICATION_SUCCESS,
		DPP_EVENT_PROGRESS_RESPONSE_PENDING,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface DppProgressStatusCode {}

		/**
		* DPP Failure event: Scanned QR code is either not a DPP URI, or the DPP URI has errors.
		*/
		public static final int DPP_EVENT_FAILURE_INVALID_URI = -1;

		/**
		* DPP Failure event: Bootstrapping/Authentication initialization process failure.
		*/
		public static final int DPP_EVENT_FAILURE_AUTHENTICATION = -2;

		/**
		* DPP Failure event: Both devices are implementing the same role and are incompatible.
		*/
		public static final int DPP_EVENT_FAILURE_NOT_COMPATIBLE = -3;

		/**
		* DPP Failure event: Configuration process has failed due to malformed message.
		*/
		public static final int DPP_EVENT_FAILURE_CONFIGURATION = -4;

		/**
		* DPP Failure event: DPP request while in another DPP exchange.
		*/
		public static final int DPP_EVENT_FAILURE_BUSY = -5;

		/**
		* DPP Failure event: No response from the peer.
		*/
		public static final int DPP_EVENT_FAILURE_TIMEOUT = -6;

		/**
		* DPP Failure event: General protocol failure.
		*/
		public static final int DPP_EVENT_FAILURE = -7;

		/**
		* DPP Failure event: Feature or option is not supported.
		*/
		public static final int DPP_EVENT_FAILURE_NOT_SUPPORTED = -8;

		/**
		* DPP Failure event: Invalid network provided to DPP configurator.
		* Network must either be WPA3-Personal (SAE) or WPA2-Personal (PSK).
		*/
		public static final int DPP_EVENT_FAILURE_INVALID_NETWORK = -9;


		/** @hide */
		@IntDef(prefix = {"DPP_EVENT_FAILURE_"}, value = {
		DPP_EVENT_FAILURE_INVALID_URI,
		DPP_EVENT_FAILURE_AUTHENTICATION,
		DPP_EVENT_FAILURE_NOT_COMPATIBLE,
		DPP_EVENT_FAILURE_CONFIGURATION,
		DPP_EVENT_FAILURE_BUSY,
		DPP_EVENT_FAILURE_TIMEOUT,
		DPP_EVENT_FAILURE,
		DPP_EVENT_FAILURE_NOT_SUPPORTED,
		DPP_EVENT_FAILURE_INVALID_NETWORK,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface DppFailureStatusCode {
		}

		/**
		* Called when local DPP Enrollee successfully receives a new Wi-Fi configuration from the
		* peer DPP configurator. This callback marks the successful end of the DPP current DPP
		* session, and no further callbacks will be called. This callback is the successful outcome
		* of a DPP flow starting with {@link WifiManager#startDppAsEnrolleeInitiator(String, Handler,
		* DppStatusCallback)}.
		*
		* @param newNetworkId New Wi-Fi configuration with a network ID received from the configurator
		*/
		public abstract void onEnrolleeSuccess(int newNetworkId);

		/**
		* Called when a DPP success event takes place, except for when configuration is received from
		* an external Configurator. The callback onSuccessConfigReceived will be used in this case.
		* This callback marks the successful end of the current DPP session, and no further
		* callbacks will be called. This callback is the successful outcome of a DPP flow starting with
		* {@link WifiManager#startDppAsConfiguratorInitiator(String, int, int, Handler,
		* DppStatusCallback)}.
		*
		* @param code DPP success status code.
		*/
		public abstract void onConfiguratorSuccess(@DppSuccessStatusCode int code);

		/**
		* Called when a DPP Failure event takes place. This callback marks the unsuccessful end of the
		* current DPP session, and no further callbacks will be called.
		*
		* @param code DPP failure status code.
		*/
		public abstract void onFailure(@DppFailureStatusCode int code);

		/**
		* Called when DPP events that indicate progress take place. Can be used by UI elements
		* to show progress.
		*
		* @param code DPP progress status code.
		*/
		public abstract void onProgress(@DppProgressStatusCode int code);
		}

wifi/java/android/net/wifi/EasyConnectStatusCallback.java

0 → 100644

+179 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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;

		import android.annotation.IntDef;
		import android.annotation.SystemApi;
		import android.os.Handler;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* Easy Connect (DPP) Status Callback. Use this callback to get status updates (success, failure,
		* progress) from the Easy Connect operation started with
		* {@link WifiManager#startEasyConnectAsConfiguratorInitiator(String,
		* int, int, Handler, EasyConnectStatusCallback)} or
		* {@link WifiManager#startEasyConnectAsEnrolleeInitiator(String,
		* Handler, EasyConnectStatusCallback)}
		*
		* @hide
		*/
		@SystemApi
		public abstract class EasyConnectStatusCallback {
		/**
		* Easy Connect Success event: Configuration sent (Configurator mode).
		*/
		public static final int EASY_CONNECT_EVENT_SUCCESS_CONFIGURATION_SENT = 0;

		/** @hide */
		@IntDef(prefix = {"EASY_CONNECT_EVENT_SUCCESS_"}, value = {
		EASY_CONNECT_EVENT_SUCCESS_CONFIGURATION_SENT,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface EasyConnectSuccessStatusCode {
		}

		/**
		* Easy Connect Progress event: Initial authentication with peer succeeded.
		*/
		public static final int EASY_CONNECT_EVENT_PROGRESS_AUTHENTICATION_SUCCESS = 0;

		/**
		* Easy Connect Progress event: Peer requires more time to process bootstrapping.
		*/
		public static final int EASY_CONNECT_EVENT_PROGRESS_RESPONSE_PENDING = 1;

		/** @hide */
		@IntDef(prefix = {"EASY_CONNECT_EVENT_PROGRESS_"}, value = {
		EASY_CONNECT_EVENT_PROGRESS_AUTHENTICATION_SUCCESS,
		EASY_CONNECT_EVENT_PROGRESS_RESPONSE_PENDING,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface EasyConnectProgressStatusCode {
		}

		/**
		* Easy Connect Failure event: Scanned QR code is either not a Easy Connect URI, or the Easy
		* Connect URI has errors.
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE_INVALID_URI = -1;

		/**
		* Easy Connect Failure event: Bootstrapping/Authentication initialization process failure.
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION = -2;

		/**
		* Easy Connect Failure event: Both devices are implementing the same role and are incompatible.
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE = -3;

		/**
		* Easy Connect Failure event: Configuration process has failed due to malformed message.
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE_CONFIGURATION = -4;

		/**
		* Easy Connect Failure event: Easy Connect request while in another Easy Connect exchange.
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE_BUSY = -5;

		/**
		* Easy Connect Failure event: No response from the peer.
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE_TIMEOUT = -6;

		/**
		* Easy Connect Failure event: General protocol failure.
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE = -7;

		/**
		* Easy Connect Failure event: Feature or option is not supported.
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED = -8;

		/**
		* Easy Connect Failure event: Invalid network provided to Easy Connect configurator.
		* Network must either be WPA3-Personal (SAE) or WPA2-Personal (PSK).
		*/
		public static final int EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK = -9;


		/** @hide */
		@IntDef(prefix = {"EASY_CONNECT_EVENT_FAILURE_"}, value = {
		EASY_CONNECT_EVENT_FAILURE_INVALID_URI,
		EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION,
		EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE,
		EASY_CONNECT_EVENT_FAILURE_CONFIGURATION,
		EASY_CONNECT_EVENT_FAILURE_BUSY,
		EASY_CONNECT_EVENT_FAILURE_TIMEOUT,
		EASY_CONNECT_EVENT_FAILURE,
		EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED,
		EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface EasyConnectFailureStatusCode {
		}

		/**
		* Called when local Easy Connect Enrollee successfully receives a new Wi-Fi configuration from
		* the
		* peer Easy Connect configurator. This callback marks the successful end of the Easy Connect
		* current Easy Connect
		* session, and no further callbacks will be called. This callback is the successful outcome
		* of a Easy Connect flow starting with
		* {@link WifiManager#startEasyConnectAsEnrolleeInitiator(String,
		* Handler,
		* EasyConnectStatusCallback)}.
		*
		* @param newNetworkId New Wi-Fi configuration with a network ID received from the configurator
		*/
		public abstract void onEnrolleeSuccess(int newNetworkId);

		/**
		* Called when a Easy Connect success event takes place, except for when configuration is
		* received from
		* an external Configurator. The callback onSuccessConfigReceived will be used in this case.
		* This callback marks the successful end of the current Easy Connect session, and no further
		* callbacks will be called. This callback is the successful outcome of a Easy Connect flow
		* starting with
		* {@link WifiManager#startEasyConnectAsConfiguratorInitiator(String, int, int, Handler,
		* EasyConnectStatusCallback)}.
		*
		* @param code Easy Connect success status code.
		*/
		public abstract void onConfiguratorSuccess(@EasyConnectSuccessStatusCode int code);

		/**
		* Called when a Easy Connect Failure event takes place. This callback marks the unsuccessful
		* end of the
		* current Easy Connect session, and no further callbacks will be called.
		*
		* @param code Easy Connect failure status code.
		*/
		public abstract void onFailure(@EasyConnectFailureStatusCode int code);

		/**
		* Called when Easy Connect events that indicate progress take place. Can be used by UI elements
		* to show progress.
		*
		* @param code Easy Connect progress status code.
		*/
		public abstract void onProgress(@EasyConnectProgressStatusCode int code);
		}

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

+51 −42

File changed.

Preview size limit exceeded, changes collapsed.