Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab62fa67 authored by Nate(Qiang) Jiang's avatar Nate(Qiang) Jiang Committed by Android (Google) Code Review
Browse files

Merge changes from topics "Aware3.1", "instantFilter"

* changes:
  Wifi: Add HAL API and implementation for instant mode filter
  Wifi: Add support for Wifi Aware 3.1
parents b2069786 6e13599d
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -27,6 +27,18 @@ import IWifiRttController;
 * Interface that represents a chip that must be configured as a single unit.
 */
interface IWifiChip extends @1.5::IWifiChip {
    /**
     * Usable Wifi channels filter masks.
     */
    enum UsableChannelFilter : @1.5::IWifiChip.UsableChannelFilter {
        /**
         * Filter Wifi channels that are supported for NAN3.1 Instant communication mode. This
         * filter should only be applied to NAN interface.
         * - If 5G is supported default discovery channel 149/44 is considered,
         * - If 5G is not supported then channel 6 has to be considered.
         */
        NAN_INSTANT_MODE = 1 << 2,
    };

    /**
     * Create a RTTController instance.
+112 −0
Original line number Diff line number Diff line
@@ -17,8 +17,15 @@
package android.hardware.wifi@1.6;

import @1.0::WifiStatus;
import @1.0::CommandIdShort;
import @1.4::NanConfigRequest;
import @1.4::NanEnableRequest;
import @1.5::IWifiNanIface;
import IWifiNanIfaceEventCallback;
import NanConfigRequestSupplemental;
import NanInitiateDataPathRequest;
import NanPublishRequest;
import NanRespondToDataPathIndicationRequest;

/**
 * Interface used to represent a single NAN (Neighbour Aware Network) iface.
@@ -40,4 +47,109 @@ interface IWifiNanIface extends @1.5::IWifiNanIface {
     *         |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|
     */
    registerEventCallback_1_6(IWifiNanIfaceEventCallback callback) generates (WifiStatus status);

    /**
     * Initiate a data-path (NDP) setup operation: Initiator.
     * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyInitiateDataPathResponse|.
     *
     * Note: supersedes the @1.0::IWifiNanIface.respondToDataPathIndicationRequest() method which is
     * deprecated as of HAL version 1.6.
     *
     * @param cmdId command Id to use for this invocation.
     * @param msg Instance of |NanInitiateDataPathRequest|.
     * @return status WifiStatus of the operation.
     *         Possible status codes:
     *         |WifiStatusCode.SUCCESS|,
     *         |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
     *         |WifiStatusCode.ERROR_INVALID_ARGS|,
     *         |WifiStatusCode.ERROR_UNKNOWN|
     */
    initiateDataPathRequest_1_6(CommandIdShort cmdId, NanInitiateDataPathRequest msg)
        generates (WifiStatus status);

    /**
     * Respond to a received data indication as part of a data-path (NDP) setup operation. An
     * indication is received by the Responder from the Initiator.
     * Asynchronous response is with
     * |IWifiNanIfaceEventCallback.notifyRespondToDataPathIndicationResponse|.
     *
     * Note: supersedes the @1.0::IWifiNanIface.respondToDataPathIndicationRequest() method which is
     * deprecated as of HAL version 1.6.
     *
     * @param cmdId command Id to use for this invocation.
     * @param msg Instance of |NanRespondToDataPathIndicationRequest|.
     * @return status WifiStatus of the operation.
     *         Possible status codes:
     *         |WifiStatusCode.SUCCESS|,
     *         |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
     *         |WifiStatusCode.ERROR_INVALID_ARGS|,
     *         |WifiStatusCode.ERROR_UNKNOWN|
     */
    respondToDataPathIndicationRequest_1_6(CommandIdShort cmdId,
        NanRespondToDataPathIndicationRequest msg) generates (WifiStatus status);

    /**
     * Enable NAN: configures and activates NAN clustering (does not start
     * a discovery session or set up data-interfaces or data-paths). Use the
     * |IWifiNanIface.configureRequest| method to change the configuration of an already enabled
     * NAN interface.
     * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyEnableResponse|.
     *
     * Note: supersedes the @1.5::IWifiNanIface.enableRequest() method which is deprecated as of
     * HAL version 1.6.
     *
     * @param cmdId command Id to use for this invocation.
     * @param msg1 Instance of |NanEnableRequest|.
     * @param msg2 Instance of |NanConfigRequestSupplemental|.
     * @return status WifiStatus of the operation.
     *         Possible status codes:
     *         |WifiStatusCode.SUCCESS|,
     *         |WifiStatusCode.ERROR_NOT_SUPPORTED|,
     *         |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
     *         |WifiStatusCode.ERROR_INVALID_ARGS|,
     *         |WifiStatusCode.ERROR_UNKNOWN|
     */
    enableRequest_1_6(CommandIdShort cmdId, NanEnableRequest msg1,
        NanConfigRequestSupplemental msg2) generates (WifiStatus status);

    /**
     * Configure NAN: configures an existing NAN functionality (i.e. assumes
     * |IWifiNanIface.enableRequest| already submitted and succeeded).
     * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyConfigResponse|.
     *
     * Note: supersedes the @1.5::IWifiNanIface.configRequest() method which is deprecated as of
     * HAL version 1.6.
     *
     * @param cmdId command Id to use for this invocation.
     * @param msg1 Instance of |NanConfigRequest|.
     * @param msg2 Instance of |NanConfigRequestSupplemental|.
     * @return status WifiStatus of the operation.
     *         Possible status codes:
     *         |WifiStatusCode.SUCCESS|,
     *         |WifiStatusCode.ERROR_NOT_SUPPORTED|,
     *         |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
     *         |WifiStatusCode.ERROR_INVALID_ARGS|,
     *         |WifiStatusCode.ERROR_UNKNOWN|
     */
    configRequest_1_6(CommandIdShort cmdId, NanConfigRequest msg1,
        NanConfigRequestSupplemental msg2) generates (WifiStatus status);

    /**
     * Publish request to start advertising a discovery service.
     * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyStartPublishResponse|.
     *
     * Note: supersedes the @1.0::IWifiNanIface.startPublishRequest() method which is deprecated as
     * of HAL version 1.6.
     *
     * @param cmdId command Id to use for this invocation.
     * @param msg Instance of |NanPublishRequest|.
     * @return status WifiStatus of the operation.
     *         Possible status codes:
     *         |WifiStatusCode.SUCCESS|,
     *         |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
     *         |WifiStatusCode.ERROR_INVALID_ARGS|,
     *         |WifiStatusCode.ERROR_UNKNOWN|
     */
    startPublishRequest_1_6(CommandIdShort cmdId, NanPublishRequest msg)
        generates (WifiStatus status);
};
+26 −0
Original line number Diff line number Diff line
@@ -45,4 +45,30 @@ interface IWifiNanIfaceEventCallback extends @1.5::IWifiNanIfaceEventCallback {
     * @param event: NanDataPathScheduleUpdateInd containing event details.
     */
    oneway eventDataPathScheduleUpdate_1_6(NanDataPathScheduleUpdateInd event);

    /**
     * Asynchronous callback indicating that a match has occurred: i.e. a service has been
     * discovered.
     *
     * Note: supersedes the @1.0::IWifiNanIfaceEventCallback.eventMatch(NanMatchInd event) method
     * which is deprecated as of HAL version 1.6.
     *
     * @param event: NanMatchInd containing event details.
     */
    oneway eventMatch_1_6(NanMatchInd event);

    /**
     * Asynchronous callback invoked in response to a capability request
     * |IWifiNanIface.getCapabilitiesRequest|.
     *
     * Note: supersedes the @1.5::IWifiNanIfaceEventCallback.notifyCapabilitiesResponse() method
     * which is deprecated as of HAL version 1.6.
     *
     * @param cmdId command Id corresponding to the original request.
     * @param status WifiNanStatus of the operation. Possible status codes are:
     *        |NanStatusType.SUCCESS|
     * @param capabilities Capability data.
     */
    oneway notifyCapabilitiesResponse_1_6(CommandIdShort id, WifiNanStatus status,
        NanCapabilities capabilities);
};
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import @1.0::CommandId;
import @1.0::WifiStatus;
import @1.4::IWifiRttController;
import IWifiRttControllerEventCallback;

/**
 * Interface used to perform RTT(Round trip time) operations.
 */
+226 −76

File changed.

Preview size limit exceeded, changes collapsed.

Loading